/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_xemacs.idb / usr / freeware / lib / xemacs-20.4 / lisp / packages / diff.elc.z / diff.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar  9 12|
|00000040| 3a 35 32 3a 32 33 20 31 | 39 39 38 0a 3b 3b 3b 20 |:52:23 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 70 61 63 6b |s-20.3/l|isp/pack|
|000000a0| 61 67 65 73 2f 64 69 66 | 66 2e 65 6c 0a 3b 3b 3b |ages/dif|f.el.;;;|
|000000b0| 20 65 6d 61 63 73 20 76 | 65 72 73 69 6f 6e 20 32 | emacs v|ersion 2|
|000000c0| 30 2e 34 20 22 45 6d 65 | 72 61 6c 64 22 20 58 45 |0.4 "Eme|rald" XE|
|000000d0| 6d 61 63 73 20 20 4c 75 | 63 69 64 2e 0a 3b 3b 3b |macs  Lu|cid..;;;|
|000000e0| 20 62 79 74 65 63 6f 6d | 70 20 76 65 72 73 69 6f | bytecom|p versio|
|000000f0| 6e 20 32 2e 32 35 20 58 | 45 6d 61 63 73 3b 20 32 |n 2.25 X|Emacs; 2|
|00000100| 32 2d 4d 61 72 2d 39 36 | 2e 0a 3b 3b 3b 20 6f 70 |2-Mar-96|..;;; op|
|00000110| 74 69 6d 69 7a 61 74 69 | 6f 6e 20 69 73 20 6f 6e |timizati|on is on|
|00000120| 2e 0a 3b 3b 3b 20 74 68 | 69 73 20 66 69 6c 65 20 |..;;; th|is file |
|00000130| 75 73 65 73 20 6f 70 63 | 6f 64 65 73 20 77 68 69 |uses opc|odes whi|
|00000140| 63 68 20 64 6f 20 6e 6f | 74 20 65 78 69 73 74 20 |ch do no|t exist |
|00000150| 69 6e 20 45 6d 61 63 73 | 20 31 39 2e 0a 0a 28 69 |in Emacs| 19...(i|
|00000160| 66 20 28 61 6e 64 20 28 | 62 6f 75 6e 64 70 20 27 |f (and (|boundp '|
|00000170| 65 6d 61 63 73 2d 76 65 | 72 73 69 6f 6e 29 0a 09 |emacs-ve|rsion)..|
|00000180| 20 28 6f 72 20 28 61 6e | 64 20 28 62 6f 75 6e 64 | (or (an|d (bound|
|00000190| 70 20 27 65 70 6f 63 68 | 3a 3a 76 65 72 73 69 6f |p 'epoch|::versio|
|000001a0| 6e 29 20 65 70 6f 63 68 | 3a 3a 76 65 72 73 69 6f |n) epoch|::versio|
|000001b0| 6e 29 0a 09 20 20 20 20 | 20 28 73 74 72 69 6e 67 |n)..    | (string|
|000001c0| 2d 6c 65 73 73 70 20 65 | 6d 61 63 73 2d 76 65 72 |-lessp e|macs-ver|
|000001d0| 73 69 6f 6e 20 22 32 30 | 22 29 29 29 0a 20 20 20 |sion "20|"))).   |
|000001e0| 20 28 65 72 72 6f 72 20 | 22 60 64 69 66 66 2e 65 | (error |"`diff.e|
|000001f0| 6c 27 20 77 61 73 20 63 | 6f 6d 70 69 6c 65 64 20 |l' was c|ompiled |
|00000200| 66 6f 72 20 45 6d 61 63 | 73 20 32 30 22 29 29 0a |for Emac|s 20")).|
|00000210| 0a 28 6f 72 20 28 62 6f | 75 6e 64 70 20 27 63 75 |.(or (bo|undp 'cu|
|00000220| 72 72 65 6e 74 2d 6c 6f | 61 64 2d 6c 69 73 74 29 |rrent-lo|ad-list)|
|00000230| 20 28 73 65 74 71 20 63 | 75 72 72 65 6e 74 2d 6c | (setq c|urrent-l|
|00000240| 6f 61 64 2d 6c 69 73 74 | 20 6e 69 6c 29 29 0a 0a |oad-list| nil))..|
|00000250| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00000260| 88 c2 c1 c3 c4 c5 c6 25 | 87 22 20 5b 70 72 6f 76 |.......%|." [prov|
|00000270| 69 64 65 20 64 69 66 66 | 20 63 75 73 74 6f 6d 2d |ide diff| custom-|
|00000280| 64 65 63 6c 61 72 65 2d | 67 72 6f 75 70 20 6e 69 |declare-|group ni|
|00000290| 6c 20 22 48 61 6e 64 6c | 69 6e 67 20 6f 75 74 70 |l "Handl|ing outp|
|000002a0| 75 74 20 66 72 6f 6d 20 | 55 6e 69 78 20 64 69 66 |ut from |Unix dif|
|000002b0| 66 20 75 74 69 6c 69 74 | 79 22 20 3a 67 72 6f 75 |f utilit|y" :grou|
|000002c0| 70 20 74 6f 6f 6c 73 5d | 20 36 29 0a 28 63 75 73 |p tools]| 6).(cus|
|000002d0| 74 6f 6d 2d 64 65 63 6c | 61 72 65 2d 76 61 72 69 |tom-decl|are-vari|
|000002e0| 61 62 6c 65 20 27 64 69 | 66 66 2d 73 77 69 74 63 |able 'di|ff-switc|
|000002f0| 68 65 73 20 27 22 2d 63 | 22 20 22 2a 41 20 6c 69 |hes '"-c|" "*A li|
|00000300| 73 74 20 6f 66 20 73 77 | 69 74 63 68 65 73 20 28 |st of sw|itches (|
|00000310| 73 74 72 69 6e 67 73 29 | 20 74 6f 20 70 61 73 73 |strings)| to pass|
|00000320| 20 74 6f 20 74 68 65 20 | 64 69 66 66 20 70 72 6f | to the |diff pro|
|00000330| 67 72 61 6d 2e 22 20 3a | 74 79 70 65 20 27 28 63 |gram." :|type '(c|
|00000340| 68 6f 69 63 65 20 73 74 | 72 69 6e 67 20 28 72 65 |hoice st|ring (re|
|00000350| 70 65 61 74 20 73 74 72 | 69 6e 67 29 29 20 3a 67 |peat str|ing)) :g|
|00000360| 72 6f 75 70 20 27 64 69 | 66 66 29 0a 28 63 75 73 |roup 'di|ff).(cus|
|00000370| 74 6f 6d 2d 64 65 63 6c | 61 72 65 2d 76 61 72 69 |tom-decl|are-vari|
|00000380| 61 62 6c 65 20 27 64 69 | 66 66 2d 64 6f 2d 6e 61 |able 'di|ff-do-na|
|00000390| 72 72 6f 77 20 27 6e 69 | 6c 20 22 2a 49 66 20 6e |rrow 'ni|l "*If n|
|000003a0| 6f 6e 2d 6e 69 6c 20 64 | 69 66 66 20 62 75 66 66 |on-nil d|iff buff|
|000003b0| 65 72 73 20 61 72 65 20 | 69 6e 69 74 69 61 6c 69 |ers are |initiali|
|000003c0| 7a 65 64 20 6e 61 72 72 | 6f 77 65 64 20 74 6f 20 |zed narr|owed to |
|000003d0| 65 61 63 68 20 64 69 66 | 66 65 72 65 6e 63 65 2e |each dif|ference.|
|000003e0| 22 20 3a 74 79 70 65 20 | 27 62 6f 6f 6c 65 61 6e |" :type |'boolean|
|000003f0| 20 3a 67 72 6f 75 70 20 | 27 64 69 66 66 29 0a 28 | :group |'diff).(|
|00000400| 63 75 73 74 6f 6d 2d 64 | 65 63 6c 61 72 65 2d 76 |custom-d|eclare-v|
|00000410| 61 72 69 61 62 6c 65 20 | 27 64 69 66 66 2d 6c 6f |ariable |'diff-lo|
|00000420| 61 64 2d 68 6f 6f 6b 73 | 20 27 6e 69 6c 20 22 48 |ad-hooks| 'nil "H|
|00000430| 6f 6f 6b 73 20 74 6f 20 | 72 75 6e 20 61 66 74 65 |ooks to |run afte|
|00000440| 72 20 6c 6f 61 64 69 6e | 67 20 64 69 66 66 2e 65 |r loadin|g diff.e|
|00000450| 6c 22 20 3a 74 79 70 65 | 20 27 68 6f 6f 6b 20 3a |l" :type| 'hook :|
|00000460| 67 72 6f 75 70 20 27 64 | 69 66 66 29 0a 28 62 79 |group 'd|iff).(by|
|00000470| 74 65 2d 63 6f 64 65 20 | 22 c0 09 c2 c3 4f 21 89 |te-code |"....O!.|
|00000480| 1c c5 59 29 16 06 c6 0e | 07 42 16 07 0e 06 ac 84 |..Y)....|.B......|
|00000490| c8 c9 21 88 ca cb 21 ac | 83 cc 16 0b cb 0e 07 42 |..!...!.|.......B|
|000004a0| 16 07 ca cd 21 ac 83 cc | 16 0d cd 0e 07 42 16 07 |....!...|.....B..|
|000004b0| ca ce 21 ac 83 cf 16 0e | ce 0e 07 42 16 07 ca d0 |..!.....|...B....|
|000004c0| 21 ac 83 cf 16 10 d0 0e | 07 42 16 07 ca d1 21 ac |!.......|.B....!.|
|000004d0| 83 c2 16 11 d1 0e 07 42 | 16 07 ca d2 21 ac 83 c2 |.......B|....!...|
|000004e0| 16 12 d2 0e 07 42 16 07 | ca d3 21 ac 85 d4 c2 21 |.....B..|..!....!|
|000004f0| 16 13 d3 0e 07 42 16 07 | ca d5 21 ac 83 cc 16 15 |.....B..|..!.....|
|00000500| d5 0e 07 42 16 07 ca d6 | 21 ac 83 cc 16 16 d6 0e |...B....|!.......|
|00000510| 07 42 16 07 ca d7 21 ac | 83 cc 16 17 d7 0e 07 42 |.B....!.|.......B|
|00000520| 16 07 ca d8 21 ac 97 d9 | da db cc 46 dc dd de df |....!...|...F....|
|00000530| 46 e0 e1 e2 e3 46 cc e4 | db e5 46 46 16 18 d8 0e |F....F..|..FF....|
|00000540| 07 42 16 07 ca e6 21 ac | 83 cc 16 26 e6 0e 07 42 |.B....!.|...&...B|
|00000550| 16 07 ca e7 21 ac 83 e8 | 16 27 e7 0e 07 42 16 07 |....!...|.'...B..|
|00000560| cc 87 22 20 5b 73 74 72 | 69 6e 67 2d 74 6f 2d 69 |.." [str|ing-to-i|
|00000570| 6e 74 20 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |nt emacs|-version|
|00000580| 20 30 20 32 20 76 65 72 | 20 31 39 20 64 69 66 66 | 0 2 ver| 19 diff|
|00000590| 2d 65 6d 61 63 73 2d 31 | 39 2d 70 20 63 75 72 72 |-emacs-1|9-p curr|
|000005a0| 65 6e 74 2d 6c 6f 61 64 | 2d 6c 69 73 74 20 72 65 |ent-load|-list re|
|000005b0| 71 75 69 72 65 20 65 6d | 61 63 73 2d 31 39 20 62 |quire em|acs-19 b|
|000005c0| 6f 75 6e 64 70 20 64 69 | 66 66 2d 6f 6c 64 2d 66 |oundp di|ff-old-f|
|000005d0| 69 6c 65 20 6e 69 6c 20 | 64 69 66 66 2d 6e 65 77 |ile nil |diff-new|
|000005e0| 2d 66 69 6c 65 20 64 69 | 66 66 2d 74 6f 74 61 6c |-file di|ff-total|
|000005f0| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 20 22 30 22 |-differe|nces "0"|
|00000600| 20 64 69 66 66 2d 63 75 | 72 72 65 6e 74 2d 64 69 | diff-cu|rrent-di|
|00000610| 66 66 65 72 65 6e 63 65 | 20 64 69 66 66 2d 63 75 |fference| diff-cu|
|00000620| 72 72 65 6e 74 2d 68 75 | 6e 6b 20 64 69 66 66 2d |rrent-hu|nk diff-|
|00000630| 74 6f 74 61 6c 2d 68 75 | 6e 6b 73 20 64 69 66 66 |total-hu|nks diff|
|00000640| 2d 68 75 6e 6b 2d 76 65 | 63 74 6f 72 20 76 65 63 |-hunk-ve|ctor vec|
|00000650| 74 6f 72 20 64 69 66 66 | 2d 6f 6c 64 2d 66 69 6c |tor diff|-old-fil|
|00000660| 65 2d 70 61 74 74 65 72 | 6e 20 64 69 66 66 2d 6e |e-patter|n diff-n|
|00000670| 65 77 2d 66 69 6c 65 2d | 70 61 74 74 65 72 6e 20 |ew-file-|pattern |
|00000680| 64 69 66 66 2d 68 75 6e | 6b 2d 70 61 74 74 65 72 |diff-hun|k-patter|
|00000690| 6e 20 64 69 66 66 2d 73 | 65 61 72 63 68 2d 70 61 |n diff-s|earch-pa|
|000006a0| 74 74 65 72 6e 2d 61 6c | 69 73 74 20 3f 65 20 22 |ttern-al|ist ?e "|
|000006b0| 5e 5b 30 2d 39 5d 5c 5c | 28 2c 5b 30 2d 39 5d 2b |^[0-9]\\|(,[0-9]+|
|000006c0| 5c 5c 29 3f 5b 61 63 64 | 5d 24 22 20 22 5e 5c 5c |\\)?[acd|]$" "^\\|
|000006d0| 28 5b 30 2d 39 5d 2b 5c | 5c 29 22 20 3f 63 20 22 |([0-9]+\|\)" ?c "|
|000006e0| 5e 5c 5c 2a 5c 5c 2a 5c | 5c 2a 5c 5c 2a 5c 5c 2a |^\\*\\*\|\*\\*\\*|
|000006f0| 5c 5c 2a 5c 5c 2a 5c 5c | 2a 5c 5c 2a 5c 5c 2a 5c |\\*\\*\\|*\\*\\*\|
|00000700| 5c 2a 5c 5c 2a 5c 5c 2a | 5c 5c 2a 5c 5c 2a 5c 6e |\*\\*\\*|\\*\\*\n|
|00000710| 22 20 22 5e 5c 5c 2a 2b | 20 5c 5c 28 5b 30 2d 39 |" "^\\*+| \\([0-9|
|00000720| 5d 2b 5c 5c 29 22 20 22 | 5e 2d 2b 20 5c 5c 28 5b |]+\\)" "|^-+ \\([|
|00000730| 30 2d 39 5d 2b 5c 5c 29 | 22 20 3f 75 20 22 5e 40 |0-9]+\\)|" ?u "^@|
|00000740| 40 20 22 20 22 5e 40 40 | 20 2d 5c 5c 28 5b 30 2d |@ " "^@@| -\\([0-|
|00000750| 39 5d 2b 5c 5c 29 22 20 | 22 5e 40 40 20 2d 5b 30 |9]+\\)" |"^@@ -[0|
|00000760| 2d 39 2c 5d 2b 20 5c 5c | 2b 5c 5c 28 5b 30 2d 39 |-9,]+ \\|+\\([0-9|
|00000770| 5d 2b 5c 5c 29 22 20 22 | 5e 5b 30 2d 39 5d 2b 22 |]+\\)" "|^[0-9]+"|
|00000780| 20 22 5e 5b 30 2d 39 2c | 5d 2b 5b 61 63 64 5d 5c | "^[0-9,|]+[acd]\|
|00000790| 5c 28 5b 30 2d 39 5d 2b | 5c 5c 29 22 20 64 69 66 |\([0-9]+|\\)" dif|
|000007a0| 66 2d 6b 65 79 6d 61 70 | 2d 67 72 6f 6b 6b 65 64 |f-keymap|-grokked|
|000007b0| 20 64 69 66 66 2d 74 65 | 6d 70 2d 74 65 6d 70 6c | diff-te|mp-templ|
|000007c0| 61 74 65 20 22 2f 74 6d | 70 2f 64 69 66 66 22 5d |ate "/tm|p/diff"]|
|000007d0| 20 38 29 0a 23 40 32 37 | 20 4b 65 79 6d 61 70 20 | 8).#@27| Keymap |
|000007e0| 75 73 65 64 20 69 6e 20 | 64 69 66 66 20 6d 6f 64 |used in |diff mod|
|000007f0| 65 2e 1f 0a 28 64 65 66 | 76 61 72 20 64 69 66 66 |e...(def|var diff|
|00000800| 2d 6d 6f 64 65 2d 6d 61 | 70 20 6e 69 6c 20 28 23 |-mode-ma|p nil (#|
|00000810| 24 20 2e 20 32 30 30 39 | 29 29 0a 28 62 79 74 65 |$ . 2009|)).(byte|
|00000820| 2d 63 6f 64 65 20 22 08 | ac ff c1 20 10 c2 08 21 |-code ".|... ...!|
|00000830| 88 c3 08 c4 c5 23 88 c3 | 08 c6 c7 23 88 c3 08 c8 |.....#..|...#....|
|00000840| c9 23 88 c3 08 ca cb 23 | 88 c3 08 cc cd 23 88 c3 |.#.....#|.....#..|
|00000850| 08 ce cf 23 88 c3 08 d0 | d1 23 88 c3 08 d2 d3 23 |...#....|.#.....#|
|00000860| 88 c3 08 d4 d5 23 88 c3 | 08 d6 d7 23 88 c3 08 d8 |.....#..|...#....|
|00000870| d9 23 88 c3 08 da db 23 | 88 c3 08 dc d5 23 88 c3 |.#.....#|.....#..|
|00000880| 08 dd de 23 88 c3 08 df | e0 23 88 c3 08 e1 e0 23 |...#....|.#.....#|
|00000890| 88 c3 08 e2 e3 23 88 c3 | 08 e4 e5 23 88 c3 08 e6 |.....#..|...#....|
|000008a0| e7 23 88 c3 08 e8 e9 23 | 88 c1 87 22 20 5b 64 69 |.#.....#|..." [di|
|000008b0| 66 66 2d 6d 6f 64 65 2d | 6d 61 70 20 6d 61 6b 65 |ff-mode-|map make|
|000008c0| 2d 6b 65 79 6d 61 70 20 | 73 75 70 70 72 65 73 73 |-keymap |suppress|
|000008d0| 2d 6b 65 79 6d 61 70 20 | 64 65 66 69 6e 65 2d 6b |-keymap |define-k|
|000008e0| 65 79 20 22 3f 22 20 64 | 65 73 63 72 69 62 65 2d |ey "?" d|escribe-|
|000008f0| 6d 6f 64 65 20 22 2e 22 | 20 64 69 66 66 2d 64 69 |mode "."| diff-di|
|00000900| 73 70 6c 61 79 2d 66 69 | 6c 65 20 22 4e 22 20 64 |splay-fi|le "N" d|
|00000910| 69 66 66 2d 6e 61 72 72 | 6f 77 20 22 57 22 20 77 |iff-narr|ow "W" w|
|00000920| 69 64 65 6e 20 22 66 22 | 20 64 69 66 66 2d 66 69 |iden "f"| diff-fi|
|00000930| 6e 64 2d 66 69 6c 65 20 | 22 68 22 20 64 69 66 66 |nd-file |"h" diff|
|00000940| 2d 73 68 6f 77 2d 68 65 | 61 64 65 72 20 22 6a 22 |-show-he|ader "j"|
|00000950| 20 64 69 66 66 2d 73 68 | 6f 77 2d 64 69 66 66 65 | diff-sh|ow-diffe|
|00000960| 72 65 6e 63 65 20 22 6e | 22 20 64 69 66 66 2d 6e |rence "n|" diff-n|
|00000970| 65 78 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 22 |ext-diff|erence "|
|00000980| 6f 22 20 64 69 66 66 2d | 66 69 6e 64 2d 66 69 6c |o" diff-|find-fil|
|00000990| 65 2d 6f 74 68 65 72 2d | 77 69 6e 64 6f 77 20 22 |e-other-|window "|
|000009a0| 70 22 20 64 69 66 66 2d | 70 72 65 76 69 6f 75 73 |p" diff-|previous|
|000009b0| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 22 71 22 20 |-differe|nce "q" |
|000009c0| 64 69 66 66 2d 71 75 69 | 74 20 22 77 22 20 64 69 |diff-qui|t "w" di|
|000009d0| 66 66 2d 66 69 6e 64 2d | 66 69 6c 65 2d 6f 74 68 |ff-find-|file-oth|
|000009e0| 65 72 2d 66 72 61 6d 65 | 20 22 03 03 22 20 22 20 |er-frame| ".." " |
|000009f0| 22 20 64 69 66 66 2d 61 | 64 76 65 72 74 69 73 65 |" diff-a|dvertise|
|00000a00| 64 2d 73 63 72 6f 6c 6c | 2d 75 70 20 62 61 63 6b |d-scroll|-up back|
|00000a10| 73 70 61 63 65 20 64 69 | 66 66 2d 61 64 76 65 72 |space di|ff-adver|
|00000a20| 74 69 73 65 64 2d 73 63 | 72 6f 6c 6c 2d 64 6f 77 |tised-sc|roll-dow|
|00000a30| 6e 20 64 65 6c 65 74 65 | 20 22 0e 22 20 64 69 66 |n delete| "." dif|
|00000a40| 66 2d 6e 65 78 74 2d 6c | 69 6e 65 20 22 10 22 20 |f-next-l|ine "." |
|00000a50| 64 69 66 66 2d 70 72 65 | 76 69 6f 75 73 2d 6c 69 |diff-pre|vious-li|
|00000a60| 6e 65 20 22 be 22 20 64 | 69 66 66 2d 65 6e 64 2d |ne "." d|iff-end-|
|00000a70| 6f 66 2d 62 75 66 66 65 | 72 20 22 bc 22 20 64 69 |of-buffe|r "." di|
|00000a80| 66 66 2d 62 65 67 69 6e | 6e 69 6e 67 2d 6f 66 2d |ff-begin|ning-of-|
|00000a90| 62 75 66 66 65 72 5d 20 | 34 29 0a 28 64 65 66 61 |buffer] |4).(defa|
|00000aa0| 6c 69 61 73 20 27 64 69 | 66 66 2d 67 72 6f 6b 2d |lias 'di|ff-grok-|
|00000ab0| 6b 65 79 73 20 23 5b 28 | 74 6f 2d 63 6f 6d 6d 61 |keys #[(|to-comma|
|00000ac0| 6e 64 20 66 72 6f 6d 2d | 63 6f 6d 6d 61 6e 64 29 |nd from-|command)|
|00000ad0| 20 22 c0 09 21 89 1a ad | 8c c3 c4 c5 8f 88 5c 6e | "..!...|......\n|
|00000ae0| 41 89 12 ac 75 c3 29 87 | 22 20 5b 77 68 65 72 65 |A...u.).|" [where|
|00000af0| 2d 69 73 2d 69 6e 74 65 | 72 6e 61 6c 20 66 72 6f |-is-inte|rnal fro|
|00000b00| 6d 2d 63 6f 6d 6d 61 6e | 64 20 6b 65 79 73 20 6e |m-comman|d keys n|
|00000b10| 69 6c 20 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |il (byte|-code ".|
|00000b20| 09 40 21 c2 09 40 21 61 | ab 86 c3 09 40 0c 5c 22 |.@!..@!a|....@.\"|
|00000b30| 88 c0 87 22 20 5b 67 6c | 6f 62 61 6c 2d 6b 65 79 |..." [gl|obal-key|
|00000b40| 2d 62 69 6e 64 69 6e 67 | 20 6b 65 79 73 20 6b 65 |-binding| keys ke|
|00000b50| 79 2d 62 69 6e 64 69 6e | 67 20 6c 6f 63 61 6c 2d |y-bindin|g local-|
|00000b60| 73 65 74 2d 6b 65 79 20 | 74 6f 2d 63 6f 6d 6d 61 |set-key |to-comma|
|00000b70| 6e 64 5d 20 33 29 20 28 | 28 65 72 72 6f 72 29 29 |nd] 3) (|(error))|
|00000b80| 5d 20 34 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 4]).(d|efalias |
|00000b90| 27 64 69 66 66 2d 67 72 | 6f 6b 2d 6b 65 79 6d 61 |'diff-gr|ok-keyma|
|00000ba0| 70 20 23 5b 6e 69 6c 20 | 22 08 3f ad bf 09 ab 93 |p #[nil |".?.....|
|00000bb0| c2 c3 21 ab 8e 0c ab 86 | c5 09 21 88 aa 83 09 20 |..!.....|..!.... |
|00000bc0| 88 c6 11 c7 10 c8 c9 ca | 5c 22 88 c8 cb cc 5c 22 |........|\"....\"|
|00000bd0| 88 c8 cd ce 5c 22 88 c8 | cf d0 5c 22 88 c8 d1 d2 |....\"..|..\"....|
|00000be0| 5c 22 88 c8 d3 d4 5c 22 | 88 c8 d5 d6 5c 22 88 c8 |\"....\"|....\"..|
|00000bf0| d7 d8 5c 22 87 22 20 5b | 64 69 66 66 2d 6b 65 79 |..\"." [|diff-key|
|00000c00| 6d 61 70 2d 67 72 6f 6b | 6b 65 64 20 74 65 72 6d |map-grok|ked term|
|00000c10| 2d 73 65 74 75 70 2d 68 | 6f 6f 6b 20 62 6f 75 6e |-setup-h|ook boun|
|00000c20| 64 70 20 63 6f 6d 6d 61 | 6e 64 2d 6c 69 6e 65 2d |dp comma|nd-line-|
|00000c30| 61 72 67 73 2d 6c 65 66 | 74 20 64 69 66 66 2d 65 |args-lef|t diff-e|
|00000c40| 6d 61 63 73 2d 31 39 2d | 70 20 72 75 6e 2d 68 6f |macs-19-|p run-ho|
|00000c50| 6f 6b 73 20 6e 69 6c 20 | 74 20 64 69 66 66 2d 67 |oks nil |t diff-g|
|00000c60| 72 6f 6b 2d 6b 65 79 73 | 20 64 69 66 66 2d 6e 65 |rok-keys| diff-ne|
|00000c70| 78 74 2d 6c 69 6e 65 20 | 6e 65 78 74 2d 6c 69 6e |xt-line |next-lin|
|00000c80| 65 20 64 69 66 66 2d 70 | 72 65 76 69 6f 75 73 2d |e diff-p|revious-|
|00000c90| 6c 69 6e 65 20 70 72 65 | 76 69 6f 75 73 2d 6c 69 |line pre|vious-li|
|00000ca0| 6e 65 20 64 69 66 66 2d | 66 6f 72 77 61 72 64 2d |ne diff-|forward-|
|00000cb0| 63 68 61 72 20 66 6f 72 | 77 61 72 64 2d 63 68 61 |char for|ward-cha|
|00000cc0| 72 20 64 69 66 66 2d 62 | 61 63 6b 77 61 72 64 2d |r diff-b|ackward-|
|00000cd0| 63 68 61 72 20 62 61 63 | 6b 77 61 72 64 2d 63 68 |char bac|kward-ch|
|00000ce0| 61 72 20 64 69 66 66 2d | 73 63 72 6f 6c 6c 2d 75 |ar diff-|scroll-u|
|00000cf0| 70 20 73 63 72 6f 6c 6c | 2d 75 70 20 64 69 66 66 |p scroll|-up diff|
|00000d00| 2d 73 63 72 6f 6c 6c 2d | 64 6f 77 6e 20 73 63 72 |-scroll-|down scr|
|00000d10| 6f 6c 6c 2d 64 6f 77 6e | 20 64 69 66 66 2d 62 65 |oll-down| diff-be|
|00000d20| 67 69 6e 6e 69 6e 67 2d | 6f 66 2d 62 75 66 66 65 |ginning-|of-buffe|
|00000d30| 72 20 62 65 67 69 6e 6e | 69 6e 67 2d 6f 66 2d 62 |r beginn|ing-of-b|
|00000d40| 75 66 66 65 72 20 64 69 | 66 66 2d 65 6e 64 2d 6f |uffer di|ff-end-o|
|00000d50| 66 2d 62 75 66 66 65 72 | 20 65 6e 64 2d 6f 66 2d |f-buffer| end-of-|
|00000d60| 62 75 66 66 65 72 5d 20 | 33 5d 29 0a 28 64 65 66 |buffer] |3]).(def|
|00000d70| 61 6c 69 61 73 20 27 64 | 69 66 66 2d 62 75 66 66 |alias 'd|iff-buff|
|00000d80| 65 72 2d 6e 61 72 72 6f | 77 65 64 2d 70 20 23 5b |er-narro|wed-p #[|
|00000d90| 6e 69 6c 20 22 8c 65 64 | 18 19 7e 88 09 65 55 ad |nil ".ed|..~..eU.|
|00000da0| 83 08 64 55 2b 3f 87 22 | 20 5b 6d 61 78 20 6d 69 |..dU+?."| [max mi|
|00000db0| 6e 5d 20 32 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |n] 2]).(|defalias|
|00000dc0| 20 27 64 69 66 66 2d 63 | 75 72 72 65 6e 74 2d 68 | 'diff-c|urrent-h|
|00000dd0| 75 6e 6b 20 23 5b 6e 69 | 6c 20 22 60 c0 09 54 c2 |unk #[ni|l "`..T.|
|00000de0| 1b 1c 1d 1e 06 0c 0d 5a | c7 56 ab 98 0d 0c 5c 5c |.......Z|.V....\\|
|00000df0| c8 a5 13 0e 06 0e 09 0b | 48 59 ab 84 0b 15 aa 66 |........|HY.....f|
|00000e00| 0b 89 14 aa 62 0e 06 0e | 09 0c 48 59 ab 84 0c 13 |....b...|..HY....|
|00000e10| aa 82 0d 13 6d ab 84 0b | 53 aa 81 0b 2c 87 22 20 |....m...|S...,." |
|00000e20| 5b 30 20 64 69 66 66 2d | 74 6f 74 61 6c 2d 68 75 |[0 diff-|total-hu|
|00000e30| 6e 6b 73 20 6e 69 6c 20 | 6d 20 65 6e 64 20 73 74 |nks nil |m end st|
|00000e40| 61 72 74 20 70 74 20 31 | 20 32 20 64 69 66 66 2d |art pt 1| 2 diff-|
|00000e50| 68 75 6e 6b 2d 76 65 63 | 74 6f 72 5d 20 35 5d 29 |hunk-vec|tor] 5])|
|00000e60| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 64 69 66 66 |.(defali|as 'diff|
|00000e70| 2d 68 75 6e 6b 2d 6d 69 | 6e 20 23 5b 28 6e 29 20 |-hunk-mi|n #[(n) |
|00000e80| 22 08 09 48 87 22 20 5b | 64 69 66 66 2d 68 75 6e |"..H." [|diff-hun|
|00000e90| 6b 2d 76 65 63 74 6f 72 | 20 6e 5d 20 32 5d 29 0a |k-vector| n] 2]).|
|00000ea0| 28 64 65 66 61 6c 69 61 | 73 20 27 64 69 66 66 2d |(defalia|s 'diff-|
|00000eb0| 68 75 6e 6b 2d 6d 61 78 | 20 23 5b 28 6e 29 20 22 |hunk-max| #[(n) "|
|00000ec0| 08 09 54 48 87 22 20 5b | 64 69 66 66 2d 68 75 6e |..TH." [|diff-hun|
|00000ed0| 6b 2d 76 65 63 74 6f 72 | 20 6e 5d 20 32 5d 29 0a |k-vector| n] 2]).|
|00000ee0| 28 64 65 66 61 6c 69 61 | 73 20 27 64 69 66 66 2d |(defalia|s 'diff-|
|00000ef0| 70 61 72 73 65 2d 68 75 | 6e 6b 73 20 23 5b 6e 69 |parse-hu|nks #[ni|
|00000f00| 6c 20 22 8a 8c c0 c1 21 | 88 7e 88 65 62 88 c2 43 |l "....!|.~.eb..C|
|00000f10| 1b c4 0d c6 c7 23 ab 87 | c8 94 0b 42 13 aa 72 0b |.....#..|...B..r.|
|00000f20| 47 53 16 09 ca cb 64 0b | 42 9f 5c 22 16 0c 2b c0 |GS....d.|B.\"..+.|
|00000f30| cd 21 87 22 20 5b 6d 65 | 73 73 61 67 65 20 22 50 |.!." [me|ssage "P|
|00000f40| 61 72 73 69 6e 67 20 64 | 69 66 66 65 72 65 6e 63 |arsing d|ifferenc|
|00000f50| 65 73 2e 2e 2e 22 20 31 | 20 68 75 6e 6b 73 20 72 |es..." 1| hunks r|
|00000f60| 65 2d 73 65 61 72 63 68 | 2d 66 6f 72 77 61 72 64 |e-search|-forward|
|00000f70| 20 64 69 66 66 2d 68 75 | 6e 6b 2d 70 61 74 74 65 | diff-hu|nk-patte|
|00000f80| 72 6e 20 6e 69 6c 20 74 | 20 30 20 64 69 66 66 2d |rn nil t| 0 diff-|
|00000f90| 74 6f 74 61 6c 2d 68 75 | 6e 6b 73 20 61 70 70 6c |total-hu|nks appl|
|00000fa0| 79 20 76 65 63 74 6f 72 | 20 64 69 66 66 2d 68 75 |y vector| diff-hu|
|00000fb0| 6e 6b 2d 76 65 63 74 6f | 72 20 22 50 61 72 73 69 |nk-vecto|r "Parsi|
|00000fc0| 6e 67 20 64 69 66 66 65 | 72 65 6e 63 65 73 2e 2e |ng diffe|rences..|
|00000fd0| 2e 64 6f 6e 65 22 5d 20 | 34 5d 29 0a 28 64 65 66 |.done"] |4]).(def|
|00000fe0| 61 6c 69 61 73 20 27 64 | 69 66 66 2d 75 70 64 61 |alias 'd|iff-upda|
|00000ff0| 74 65 2d 6d 6f 64 65 6c | 69 6e 65 20 23 5b 6e 69 |te-model|ine #[ni|
|00001000| 6c 20 22 60 c0 09 21 57 | ac 87 60 c2 09 21 59 ad |l "`..!W|..`..!Y.|
|00001010| 8b c1 20 11 c3 09 21 14 | c5 c6 20 21 87 22 20 5b |.. ...!.|.. !." [|
|00001020| 64 69 66 66 2d 68 75 6e | 6b 2d 6d 69 6e 20 64 69 |diff-hun|k-min di|
|00001030| 66 66 2d 63 75 72 72 65 | 6e 74 2d 68 75 6e 6b 20 |ff-curre|nt-hunk |
|00001040| 64 69 66 66 2d 68 75 6e | 6b 2d 6d 61 78 20 69 6e |diff-hun|k-max in|
|00001050| 74 2d 74 6f 2d 73 74 72 | 69 6e 67 20 64 69 66 66 |t-to-str|ing diff|
|00001060| 2d 63 75 72 72 65 6e 74 | 2d 64 69 66 66 65 72 65 |-current|-differe|
|00001070| 6e 63 65 20 73 65 74 2d | 62 75 66 66 65 72 2d 6d |nce set-|buffer-m|
|00001080| 6f 64 69 66 69 65 64 2d | 70 20 62 75 66 66 65 72 |odified-|p buffer|
|00001090| 2d 6d 6f 64 69 66 69 65 | 64 2d 70 5d 20 33 5d 29 |-modifie|d-p] 3])|
|000010a0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 64 69 66 66 |.(defali|as 'diff|
|000010b0| 2d 72 65 61 64 2d 61 72 | 67 73 20 23 5b 28 6f 6c |-read-ar|gs #[(ol|
|000010c0| 64 70 72 6f 6d 70 74 20 | 6e 65 77 70 72 6f 6d 70 |dprompt |newpromp|
|000010d0| 74 20 73 77 69 74 63 68 | 70 72 6f 6d 70 74 20 26 |t switch|prompt &|
|000010e0| 6f 70 74 69 6f 6e 61 6c | 20 66 69 6c 65 2d 66 6f |optional| file-fo|
|000010f0| 72 2d 62 61 63 6b 75 70 | 29 20 22 c0 89 19 1a 0b |r-backup|) ".....|
|00001100| ab cc 0b 89 11 ab 93 c4 | 09 21 ab 8e c5 c6 0e 07 |........|.!......|
|00001110| c8 09 21 5c 22 c0 09 c9 | 24 aa 8a c5 c6 0e 07 ca |..!\"...|$.......|
|00001120| 5c 22 c0 89 c9 24 11 cb | 09 21 89 12 ab 93 c4 5c |\"...$..|.!.....\|
|00001130| 6e 21 ab 8e c5 c6 0e 0c | c8 5c 6e 21 5c 22 c0 5c |n!......|.\n!\".\|
|00001140| 6e c9 24 aa 8c c5 c6 0e | 0c ca 5c 22 cd 09 21 c0 |n.$.....|..\"..!.|
|00001150| c9 24 12 aa 9a c5 c6 0e | 0c ca 5c 22 c0 89 c9 24 |.$......|..\"...$|
|00001160| 12 c5 c6 0e 07 c8 5c 6e | 21 5c 22 c0 cd 5c 6e 21 |......\n|!\"..\n!|
|00001170| c9 24 11 5c 6e 09 ce 0e | 0f 21 45 2a 87 22 20 5b |.$.\n...|.!E*." [|
|00001180| 6e 69 6c 20 6e 65 77 66 | 20 6f 6c 64 66 20 66 69 |nil newf| oldf fi|
|00001190| 6c 65 2d 66 6f 72 2d 62 | 61 63 6b 75 70 20 66 69 |le-for-b|ackup fi|
|000011a0| 6c 65 2d 65 78 69 73 74 | 73 2d 70 20 72 65 61 64 |le-exist|s-p read|
|000011b0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 66 6f 72 6d 61 |-file-na|me forma|
|000011c0| 74 20 6e 65 77 70 72 6f | 6d 70 74 20 66 69 6c 65 |t newpro|mpt file|
|000011d0| 2d 6e 61 6d 65 2d 6e 6f | 6e 64 69 72 65 63 74 6f |-name-no|ndirecto|
|000011e0| 72 79 20 74 20 22 22 20 | 66 69 6c 65 2d 6e 65 77 |ry t "" |file-new|
|000011f0| 65 73 74 2d 62 61 63 6b | 75 70 20 6f 6c 64 70 72 |est-back|up oldpr|
|00001200| 6f 6d 70 74 20 66 69 6c | 65 2d 6e 61 6d 65 2d 64 |ompt fil|e-name-d|
|00001210| 69 72 65 63 74 6f 72 79 | 20 64 69 66 66 2d 72 65 |irectory| diff-re|
|00001220| 61 64 2d 73 77 69 74 63 | 68 65 73 20 73 77 69 74 |ad-switc|hes swit|
|00001230| 63 68 70 72 6f 6d 70 74 | 5d 20 36 5d 29 0a 28 64 |chprompt|] 6]).(d|
|00001240| 65 66 61 6c 69 61 73 20 | 27 64 69 66 66 2d 72 65 |efalias |'diff-re|
|00001250| 61 64 2d 73 77 69 74 63 | 68 65 73 20 23 5b 28 73 |ad-switc|hes #[(s|
|00001260| 77 69 74 63 68 70 72 6f | 6d 70 74 29 20 22 08 ad |witchpro|mpt) "..|
|00001270| 98 09 3c ab 87 c2 c3 09 | c4 23 aa 81 09 1d c6 c7 |..<.....|.#......|
|00001280| c8 0e 09 0d 5c 22 0d 5c | 22 21 29 87 22 20 5b 63 |....\".\|"!)." [c|
|00001290| 75 72 72 65 6e 74 2d 70 | 72 65 66 69 78 2d 61 72 |urrent-p|refix-ar|
|000012a0| 67 20 64 69 66 66 2d 73 | 77 69 74 63 68 65 73 20 |g diff-s|witches |
|000012b0| 6d 61 70 63 6f 6e 63 61 | 74 20 69 64 65 6e 74 69 |mapconca|t identi|
|000012c0| 74 79 20 22 20 22 20 64 | 65 66 61 75 6c 74 20 64 |ty " " d|efault d|
|000012d0| 69 66 66 2d 66 69 78 2d | 73 77 69 74 63 68 65 73 |iff-fix-|switches|
|000012e0| 20 72 65 61 64 2d 73 74 | 72 69 6e 67 20 66 6f 72 | read-st|ring for|
|000012f0| 6d 61 74 20 73 77 69 74 | 63 68 70 72 6f 6d 70 74 |mat swit|chprompt|
|00001300| 5d 20 35 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 5]).(d|efalias |
|00001310| 27 64 69 66 66 2d 66 69 | 78 2d 73 77 69 74 63 68 |'diff-fi|x-switch|
|00001320| 65 73 20 23 5b 28 73 77 | 69 74 63 68 2d 73 70 65 |es #[(sw|itch-spe|
|00001330| 63 29 20 22 08 3b ab 9d | c1 c2 1b 1c c5 c6 08 0b |c) ".;..|........|
|00001340| 23 ab 8e 08 c7 94 c7 95 | 4f 0c 42 14 c2 95 13 aa |#.......|O.B.....|
|00001350| 6b 0c 9f 2a 87 08 87 22 | 20 5b 73 77 69 74 63 68 |k..*..."| [switch|
|00001360| 2d 73 70 65 63 20 6e 69 | 6c 20 30 20 73 74 61 72 |-spec ni|l 0 star|
|00001370| 74 20 72 65 73 75 6c 74 | 20 73 74 72 69 6e 67 2d |t result| string-|
|00001380| 6d 61 74 63 68 20 22 5c | 5c 28 5c 5c 53 2d 2b 5c |match "\|\(\\S-+\|
|00001390| 5c 29 22 20 31 5d 20 34 | 5d 29 0a 28 64 65 66 61 |\)" 1] 4|]).(defa|
|000013a0| 6c 69 61 73 20 27 64 69 | 66 66 2d 67 65 74 2d 66 |lias 'di|ff-get-f|
|000013b0| 69 6c 65 2d 62 75 66 66 | 65 72 20 23 5b 28 66 69 |ile-buff|er #[(fi|
|000013c0| 6c 65 29 20 22 c0 09 21 | 89 1a 3f 1b 5c 6e ab 90 |le) "..!|..?.\n..|
|000013d0| c4 5c 6e 21 ab 8b c5 c6 | c7 5c 6e 21 5c 22 88 c8 |.\n!....|.\n!\"..|
|000013e0| c9 21 88 ca 09 21 0b 2a | 42 87 22 20 5b 67 65 74 |.!...!.*|B." [get|
|000013f0| 2d 66 69 6c 65 2d 62 75 | 66 66 65 72 20 66 69 6c |-file-bu|ffer fil|
|00001400| 65 20 62 75 66 66 20 64 | 65 6c 2d 70 20 62 75 66 |e buff d|el-p buf|
|00001410| 66 65 72 2d 6d 6f 64 69 | 66 69 65 64 2d 70 20 6d |fer-modi|fied-p m|
|00001420| 65 73 73 61 67 65 20 22 | 42 75 66 66 65 72 20 25 |essage "|Buffer %|
|00001430| 73 20 69 73 20 6d 6f 64 | 69 66 69 65 64 2e 20 20 |s is mod|ified.  |
|00001440| 44 69 66 66 69 6e 67 20 | 61 67 61 69 6e 73 74 20 |Diffing |against |
|00001450| 62 75 66 66 65 72 20 63 | 6f 6e 74 65 6e 74 73 2e |buffer c|ontents.|
|00001460| 22 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 73 69 |" buffer|-name si|
|00001470| 74 2d 66 6f 72 20 31 20 | 66 69 6e 64 2d 66 69 6c |t-for 1 |find-fil|
|00001480| 65 2d 6e 6f 73 65 6c 65 | 63 74 5d 20 35 5d 29 0a |e-nosele|ct] 5]).|
|00001490| 28 64 65 66 61 6c 69 61 | 73 20 27 64 69 66 66 2d |(defalia|s 'diff-|
|000014a0| 63 6c 65 61 6e 75 70 2d | 62 75 66 66 65 72 73 20 |cleanup-|buffers |
|000014b0| 23 5b 6e 69 6c 20 22 08 | 09 44 89 1a ab a1 5c 6e |#[nil ".|.D....\n|
|000014c0| 40 c3 1c 89 1d 41 ab 91 | c6 0d 40 21 89 14 ab 89 |@....A..|..@!....|
|000014d0| c7 0c 21 ac 84 c8 0c 21 | 88 2a 5c 6e 41 89 12 ac |..!....!|.*\nA...|
|000014e0| 5f c9 ca 21 ad 83 c8 ca | 21 29 87 22 20 5b 64 69 |_..!....|!)." [di|
|000014f0| 66 66 2d 6f 6c 64 2d 66 | 69 6c 65 20 64 69 66 66 |ff-old-f|ile diff|
|00001500| 2d 6e 65 77 2d 66 69 6c | 65 20 66 69 6c 65 73 20 |-new-fil|e files |
|00001510| 6e 69 6c 20 62 75 66 66 | 20 65 6e 74 20 67 65 74 |nil buff| ent get|
|00001520| 2d 66 69 6c 65 2d 62 75 | 66 66 65 72 20 62 75 66 |-file-bu|ffer buf|
|00001530| 66 65 72 2d 6d 6f 64 69 | 66 69 65 64 2d 70 20 6b |fer-modi|fied-p k|
|00001540| 69 6c 6c 2d 62 75 66 66 | 65 72 20 67 65 74 2d 62 |ill-buff|er get-b|
|00001550| 75 66 66 65 72 20 22 2a | 44 69 66 66 20 48 65 61 |uffer "*|Diff Hea|
|00001560| 64 65 72 2a 22 5d 20 33 | 5d 29 0a 23 40 35 32 20 |der*"] 3|]).#@52 |
|00001570| 52 65 74 75 72 6e 20 74 | 68 65 20 6c 61 74 65 73 |Return t|he lates|
|00001580| 74 20 65 78 69 73 74 69 | 6e 67 20 62 61 63 6b 75 |t existi|ng backu|
|00001590| 70 20 6f 66 20 46 49 4c | 45 2c 20 6f 72 20 6e 69 |p of FIL|E, or ni|
|000015a0| 6c 2e 1f 0a 28 64 65 66 | 61 6c 69 61 73 20 27 64 |l...(def|alias 'd|
|000015b0| 69 66 66 2d 6c 61 74 65 | 73 74 2d 62 61 63 6b 75 |iff-late|st-backu|
|000015c0| 70 2d 66 69 6c 65 20 23 | 5b 28 66 69 6c 65 29 20 |p-file #|[(file) |
|000015d0| 22 c0 09 21 19 c2 09 c3 | 5c 22 89 1c ab 86 0c c3 |"..!....|\"......|
|000015e0| 09 5c 22 aa ae c5 09 21 | 1e 06 c7 0e 06 21 ad 82 |.\"....!|.....!..|
|000015f0| 0e 06 29 ae 9e c8 09 21 | 1e 09 ca 09 21 cb 50 89 |..)....!|....!.P.|
|00001600| 1e 0c 47 1e 0d 0e 09 ce | cf 0e 0c 0e 09 5c 22 d0 |..G.....|.....\".|
|00001610| 5c 22 40 50 2b 2a 87 22 | 20 5b 65 78 70 61 6e 64 |\"@P+*."| [expand|
|00001620| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 66 69 6c 65 20 |-file-na|me file |
|00001630| 66 69 6e 64 2d 66 69 6c | 65 2d 6e 61 6d 65 2d 68 |find-fil|e-name-h|
|00001640| 61 6e 64 6c 65 72 20 64 | 69 66 66 2d 6c 61 74 65 |andler d|iff-late|
|00001650| 73 74 2d 62 61 63 6b 75 | 70 2d 66 69 6c 65 20 68 |st-backu|p-file h|
|00001660| 61 6e 64 6c 65 72 20 6d | 61 6b 65 2d 62 61 63 6b |andler m|ake-back|
|00001670| 75 70 2d 66 69 6c 65 2d | 6e 61 6d 65 20 62 61 6b |up-file-|name bak|
|00001680| 20 66 69 6c 65 2d 65 78 | 69 73 74 73 2d 70 20 66 | file-ex|ists-p f|
|00001690| 69 6c 65 2d 6e 61 6d 65 | 2d 64 69 72 65 63 74 6f |ile-name|-directo|
|000016a0| 72 79 20 64 69 72 20 66 | 69 6c 65 2d 6e 61 6d 65 |ry dir f|ile-name|
|000016b0| 2d 6e 6f 6e 64 69 72 65 | 63 74 6f 72 79 20 22 2e |-nondire|ctory ".|
|000016c0| 7e 22 20 62 61 73 65 2d | 76 65 72 73 69 6f 6e 73 |~" base-|versions|
|000016d0| 20 62 76 2d 6c 65 6e 67 | 74 68 20 73 6f 72 74 20 | bv-leng|th sort |
|000016e0| 66 69 6c 65 2d 6e 61 6d | 65 2d 61 6c 6c 2d 63 6f |file-nam|e-all-co|
|000016f0| 6d 70 6c 65 74 69 6f 6e | 73 20 23 5b 28 66 6e 31 |mpletion|s #[(fn1|
|00001700| 20 66 6e 32 29 20 22 c0 | 09 21 c0 5c 6e 21 56 87 | fn2) ".|.!.\n!V.|
|00001710| 22 20 5b 62 61 63 6b 75 | 70 2d 65 78 74 72 61 63 |" [backu|p-extrac|
|00001720| 74 2d 76 65 72 73 69 6f | 6e 20 66 6e 31 20 66 6e |t-versio|n fn1 fn|
|00001730| 32 5d 20 33 5d 5d 20 36 | 20 28 23 24 20 2e 20 35 |2] 3]] 6| (#$ . 5|
|00001740| 34 38 38 29 5d 29 0a 23 | 40 31 32 30 20 52 65 74 |488)]).#|@120 Ret|
|00001750| 75 72 6e 20 6c 69 6e 65 | 20 6e 75 6d 62 65 72 20 |urn line| number |
|00001760| 6f 66 20 63 75 72 72 65 | 6e 74 20 68 75 6e 6b 20 |of curre|nt hunk |
|00001770| 69 6e 20 60 64 69 66 66 | 2d 6e 65 77 2d 66 69 6c |in `diff|-new-fil|
|00001780| 65 27 2e 0a 57 69 74 68 | 20 6f 70 74 69 6f 6e 61 |e'..With| optiona|
|00001790| 6c 20 61 72 67 75 6d 65 | 6e 74 20 4f 4c 44 2d 46 |l argume|nt OLD-F|
|000017a0| 49 4c 45 2d 50 2c 20 75 | 73 65 20 60 64 69 66 66 |ILE-P, u|se `diff|
|000017b0| 2d 6f 6c 64 2d 66 69 6c | 65 27 20 69 6e 73 74 65 |-old-fil|e' inste|
|000017c0| 61 64 2e 1f 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |ad...(de|falias '|
|000017d0| 64 69 66 66 2d 66 69 6c | 65 2d 6c 69 6e 65 20 23 |diff-fil|e-line #|
|000017e0| 5b 28 26 6f 70 74 69 6f | 6e 61 6c 20 6f 6c 64 2d |[(&optio|nal old-|
|000017f0| 66 69 6c 65 2d 70 29 20 | 22 8a c0 09 21 c2 09 21 |file-p) |"...!..!|
|00001800| 0b ab 83 0c aa 81 0d 1e | 06 1e 07 89 1e 08 62 88 |........|......b.|
|00001810| 0e 06 ab 89 c9 0e 06 0e | 07 ca 23 ac 8b cb cc 0b |........|..#.....|
|00001820| ab 83 cd aa 81 ce 5c 22 | 88 cf d0 94 d0 95 7b 21 |......\"|......{!|
|00001830| 2c 87 22 20 5b 64 69 66 | 66 2d 68 75 6e 6b 2d 6d |,." [dif|f-hunk-m|
|00001840| 69 6e 20 64 69 66 66 2d | 63 75 72 72 65 6e 74 2d |in diff-|current-|
|00001850| 68 75 6e 6b 20 64 69 66 | 66 2d 68 75 6e 6b 2d 6d |hunk dif|f-hunk-m|
|00001860| 61 78 20 6f 6c 64 2d 66 | 69 6c 65 2d 70 20 64 69 |ax old-f|ile-p di|
|00001870| 66 66 2d 6f 6c 64 2d 66 | 69 6c 65 2d 70 61 74 74 |ff-old-f|ile-patt|
|00001880| 65 72 6e 20 64 69 66 66 | 2d 6e 65 77 2d 66 69 6c |ern diff|-new-fil|
|00001890| 65 2d 70 61 74 74 65 72 | 6e 20 72 65 67 65 78 70 |e-patter|n regexp|
|000018a0| 20 6d 61 78 20 6d 69 6e | 20 72 65 2d 73 65 61 72 | max min| re-sear|
|000018b0| 63 68 2d 66 6f 72 77 61 | 72 64 20 74 20 65 72 72 |ch-forwa|rd t err|
|000018c0| 6f 72 20 22 55 6e 61 62 | 6c 65 20 74 6f 20 6c 6f |or "Unab|le to lo|
|000018d0| 63 61 74 65 20 61 20 66 | 69 6c 65 20 6c 69 6e 65 |cate a f|ile line|
|000018e0| 20 66 6f 72 20 25 73 20 | 66 69 6c 65 2e 22 20 22 | for %s |file." "|
|000018f0| 6f 6c 64 22 20 22 6e 65 | 77 22 20 73 74 72 69 6e |old" "ne|w" strin|
|00001900| 67 2d 74 6f 2d 69 6e 74 | 20 31 5d 20 35 20 28 23 |g-to-int| 1] 5 (#|
|00001910| 24 20 2e 20 35 39 36 35 | 29 5d 29 0a 28 64 65 66 |$ . 5965|)]).(def|
|00001920| 61 6c 69 61 73 20 27 64 | 69 66 66 2d 72 75 6e 2d |alias 'd|iff-run-|
|00001930| 64 69 66 66 20 23 5b 28 | 73 77 69 74 63 68 65 73 |diff #[(|switches|
|00001940| 20 6f 6c 64 20 6f 6c 64 | 2d 74 65 6d 70 20 6e 65 | old old|-temp ne|
|00001950| 77 20 6e 65 77 2d 74 65 | 6d 70 29 20 22 c0 c1 c2 |w new-te|mp) "...|
|00001960| 0b c4 23 c4 0d c4 0e 06 | c7 b1 07 88 c8 c9 ca cb |..#.....|........|
|00001970| cc cb cd 0b 0e 0e 0e 0f | 44 5c 22 26 06 87 22 20 |........|D\"&.." |
|00001980| 5b 22 64 69 66 66 20 22 | 20 6d 61 70 63 6f 6e 63 |["diff "| mapconc|
|00001990| 61 74 20 69 64 65 6e 74 | 69 74 79 20 73 77 69 74 |at ident|ity swit|
|000019a0| 63 68 65 73 20 22 20 22 | 20 6f 6c 64 20 6e 65 77 |ches " "| old new|
|000019b0| 20 22 5c 6e 22 20 61 70 | 70 6c 79 20 63 61 6c 6c | "\n" ap|ply call|
|000019c0| 2d 70 72 6f 63 65 73 73 | 20 22 64 69 66 66 22 20 |-process| "diff" |
|000019d0| 6e 69 6c 20 74 20 61 70 | 70 65 6e 64 20 6f 6c 64 |nil t ap|pend old|
|000019e0| 2d 74 65 6d 70 20 6e 65 | 77 2d 74 65 6d 70 5d 20 |-temp ne|w-temp] |
|000019f0| 31 30 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |10]).(de|falias '|
|00001a00| 64 69 66 66 2d 66 69 78 | 2d 66 69 6c 65 2d 6e 61 |diff-fix|-file-na|
|00001a10| 6d 65 73 20 23 5b 28 6f | 6c 64 20 6f 6c 64 2d 74 |mes #[(o|ld old-t|
|00001a20| 65 6d 70 20 6e 65 77 20 | 6e 65 77 2d 74 65 6d 70 |emp new |new-temp|
|00001a30| 20 70 61 74 74 65 72 6e | 29 20 22 8a 8c 08 09 44 | pattern|) "....D|
|00001a40| 5c 6e 0b 44 c4 89 1d 1e | 06 1e 07 1e 08 65 62 88 |\n.D....|.....eb.|
|00001a50| c9 0e 5c 6e c4 cb 23 ab | 85 65 cc 94 7d 88 0e 08 |..\n..#.|.e..}...|
|00001a60| ad b5 cd ce 0e 07 40 21 | cf 51 1e 10 65 62 88 d1 |......@!|.Q..eb..|
|00001a70| 79 88 c9 0e 10 c4 cb 23 | ab 90 d1 94 62 88 60 d1 |y......#|....b.`.|
|00001a80| 95 7c 88 0e 08 40 63 88 | aa 68 29 0e 08 41 16 08 |.|...@c.|.h)..A..|
|00001a90| 0e 07 41 16 07 aa 47 2e | 06 87 22 20 5b 6f 6c 64 |..A...G.|.." [old|
|00001aa0| 20 6e 65 77 20 6f 6c 64 | 2d 74 65 6d 70 20 6e 65 | new old|-temp ne|
|00001ab0| 77 2d 74 65 6d 70 20 6e | 69 6c 20 63 61 73 65 2d |w-temp n|il case-|
|00001ac0| 66 6f 6c 64 2d 73 65 61 | 72 63 68 20 62 75 66 66 |fold-sea|rch buff|
|00001ad0| 65 72 2d 72 65 61 64 2d | 6f 6e 6c 79 20 74 65 6d |er-read-|only tem|
|00001ae0| 70 73 20 66 69 6c 65 73 | 20 72 65 2d 73 65 61 72 |ps files| re-sear|
|00001af0| 63 68 2d 66 6f 72 77 61 | 72 64 20 70 61 74 74 65 |ch-forwa|rd patte|
|00001b00| 72 6e 20 74 20 30 20 22 | 5b 20 09 5c 6e 5d 5c 5c |rn t 0 "|[ .\n]\\|
|00001b10| 28 22 20 72 65 67 65 78 | 70 2d 71 75 6f 74 65 20 |(" regex|p-quote |
|00001b20| 22 5c 5c 29 5b 20 09 5c | 6e 5d 22 20 72 65 67 65 |"\\)[ .\|n]" rege|
|00001b30| 78 70 20 31 5d 20 34 5d | 29 0a 23 40 38 33 34 20 |xp 1] 4]|).#@834 |
|00001b40| 44 69 66 66 20 4d 6f 64 | 65 20 69 73 20 75 73 65 |Diff Mod|e is use|
|00001b50| 64 20 62 79 20 5c 5b 64 | 69 66 66 5d 20 66 6f 72 |d by \[d|iff] for|
|00001b60| 20 70 65 72 75 73 69 6e | 67 20 74 68 65 20 6f 75 | perusin|g the ou|
|00001b70| 74 70 75 74 20 66 72 6f | 6d 20 74 68 65 20 64 69 |tput fro|m the di|
|00001b80| 66 66 20 70 72 6f 67 72 | 61 6d 2e 0a 41 6c 6c 20 |ff progr|am..All |
|00001b90| 6e 6f 72 6d 61 6c 20 65 | 64 69 74 69 6e 67 20 63 |normal e|diting c|
|00001ba0| 6f 6d 6d 61 6e 64 73 20 | 61 72 65 20 74 75 72 6e |ommands |are turn|
|00001bb0| 65 64 20 6f 66 66 2e 20 | 20 49 6e 73 74 65 61 64 |ed off. | Instead|
|00001bc0| 2c 20 74 68 65 73 65 20 | 61 72 65 20 61 76 61 69 |, these |are avai|
|00001bd0| 6c 61 62 6c 65 3a 0a 5c | 3c 64 69 66 66 2d 6d 6f |lable:.\|<diff-mo|
|00001be0| 64 65 2d 6d 61 70 3e 0a | 5c 5b 64 69 66 66 2d 61 |de-map>.|\[diff-a|
|00001bf0| 64 76 65 72 74 69 73 65 | 64 2d 73 63 72 6f 6c 6c |dvertise|d-scroll|
|00001c00| 2d 75 70 5d 09 53 63 72 | 6f 6c 6c 20 74 6f 20 6e |-up].Scr|oll to n|
|00001c10| 65 78 74 20 73 63 72 65 | 65 6e 20 6f 66 20 74 68 |ext scre|en of th|
|00001c20| 69 73 20 64 69 66 66 65 | 72 65 6e 63 65 2e 0a 5c |is diffe|rence..\|
|00001c30| 5b 64 69 66 66 2d 61 64 | 76 65 72 74 69 73 65 64 |[diff-ad|vertised|
|00001c40| 2d 73 63 72 6f 6c 6c 2d | 64 6f 77 6e 5d 09 53 63 |-scroll-|down].Sc|
|00001c50| 72 6f 6c 6c 20 74 6f 20 | 70 72 65 76 69 6f 75 73 |roll to |previous|
|00001c60| 20 73 63 72 65 65 6e 20 | 6f 66 20 74 68 69 73 20 | screen |of this |
|00001c70| 64 69 66 66 65 72 65 6e | 63 65 2e 0a 5c 5b 64 69 |differen|ce..\[di|
|00001c80| 66 66 2d 6e 65 78 74 2d | 64 69 66 66 65 72 65 6e |ff-next-|differen|
|00001c90| 63 65 5d 09 4d 6f 76 65 | 20 74 6f 20 4e 65 78 74 |ce].Move| to Next|
|00001ca0| 20 44 69 66 66 65 72 65 | 6e 63 65 2e 0a 5c 5b 64 | Differe|nce..\[d|
|00001cb0| 69 66 66 2d 70 72 65 76 | 69 6f 75 73 2d 64 69 66 |iff-prev|ious-dif|
|00001cc0| 66 65 72 65 6e 63 65 5d | 09 4d 6f 76 65 20 74 6f |ference]|.Move to|
|00001cd0| 20 50 72 65 76 69 6f 75 | 73 20 44 69 66 66 65 72 | Previou|s Differ|
|00001ce0| 65 6e 63 65 2e 0a 5c 5b | 64 69 66 66 2d 73 68 6f |ence..\[|diff-sho|
|00001cf0| 77 2d 64 69 66 66 65 72 | 65 6e 63 65 5d 09 4a 75 |w-differ|ence].Ju|
|00001d00| 6d 70 20 74 6f 20 64 69 | 66 66 65 72 65 6e 63 65 |mp to di|fference|
|00001d10| 20 73 70 65 63 69 66 69 | 65 64 20 62 79 20 6e 75 | specifi|ed by nu|
|00001d20| 6d 65 72 69 63 20 70 6f | 73 69 74 69 6f 6e 2e 0a |meric po|sition..|
|00001d30| 5c 5b 64 69 66 66 2d 66 | 69 6e 64 2d 66 69 6c 65 |\[diff-f|ind-file|
|00001d40| 5d 09 46 69 6e 64 20 63 | 75 72 72 65 6e 74 20 64 |].Find c|urrent d|
|00001d50| 69 66 66 20 69 6e 20 66 | 69 6c 65 0a 5c 5b 64 69 |iff in f|ile.\[di|
|00001d60| 66 66 2d 66 69 6e 64 2d | 66 69 6c 65 2d 6f 74 68 |ff-find-|file-oth|
|00001d70| 65 72 2d 77 69 6e 64 6f | 77 5d 09 46 69 6e 64 20 |er-windo|w].Find |
|00001d80| 63 75 72 72 65 6e 74 20 | 64 69 66 66 20 69 6e 20 |current |diff in |
|00001d90| 66 69 6c 65 20 69 6e 20 | 6f 74 68 65 72 20 77 69 |file in |other wi|
|00001da0| 6e 64 6f 77 0a 5c 5b 64 | 69 66 66 2d 64 69 73 70 |ndow.\[d|iff-disp|
|00001db0| 6c 61 79 2d 66 69 6c 65 | 5d 09 44 69 73 70 6c 61 |lay-file|].Displa|
|00001dc0| 79 20 66 69 6c 65 20 69 | 6e 20 6f 74 68 65 72 20 |y file i|n other |
|00001dd0| 77 69 6e 64 6f 77 0a 5c | 5b 64 69 66 66 2d 6e 61 |window.\|[diff-na|
|00001de0| 72 72 6f 77 5d 09 4e 61 | 72 72 6f 77 20 64 69 66 |rrow].Na|rrow dif|
|00001df0| 66 20 62 75 66 66 65 72 | 20 74 6f 20 63 75 72 72 |f buffer| to curr|
|00001e00| 65 6e 74 20 64 69 66 66 | 65 72 65 6e 63 65 0a 5c |ent diff|erence.\|
|00001e10| 5b 77 69 64 65 6e 5d 09 | 57 69 64 65 6e 20 64 69 |[widen].|Widen di|
|00001e20| 66 66 20 62 75 66 66 65 | 72 0a 5c 5b 64 69 66 66 |ff buffe|r.\[diff|
|00001e30| 2d 73 68 6f 77 2d 68 65 | 61 64 65 72 5d 09 53 68 |-show-he|ader].Sh|
|00001e40| 6f 77 20 64 69 66 66 20 | 68 65 61 64 65 72 20 64 |ow diff |header d|
|00001e50| 65 73 63 72 69 62 69 6e | 67 20 66 69 6c 65 20 6e |escribin|g file n|
|00001e60| 61 6d 65 20 65 74 63 2e | 0a 5c 5b 64 69 66 66 2d |ame etc.|.\[diff-|
|00001e70| 71 75 69 74 5d 09 51 75 | 69 74 20 64 69 66 66 0a |quit].Qu|it diff.|
|00001e80| 1f 0a 28 64 65 66 61 6c | 69 61 73 20 27 64 69 66 |..(defal|ias 'dif|
|00001e90| 66 2d 6d 6f 64 65 20 23 | 5b 6e 69 6c 20 22 c0 09 |f-mode #|[nil "..|
|00001ea0| 21 88 c2 20 88 c3 14 c5 | 16 06 c7 16 08 c9 16 5c |!.. ....|.......\|
|00001eb0| 6e cb 16 0c cd 20 88 ce | 0e 0f 21 89 16 10 87 22 |n.... ..|..!...."|
|00001ec0| 20 5b 75 73 65 2d 6c 6f | 63 61 6c 2d 6d 61 70 20 | [use-lo|cal-map |
|00001ed0| 64 69 66 66 2d 6d 6f 64 | 65 2d 6d 61 70 20 64 69 |diff-mod|e-map di|
|00001ee0| 66 66 2d 67 72 6f 6b 2d | 6b 65 79 6d 61 70 20 74 |ff-grok-|keymap t|
|00001ef0| 20 62 75 66 66 65 72 2d | 72 65 61 64 2d 6f 6e 6c | buffer-|read-onl|
|00001f00| 79 20 64 69 66 66 2d 6d | 6f 64 65 20 6d 61 6a 6f |y diff-m|ode majo|
|00001f10| 72 2d 6d 6f 64 65 20 22 | 44 69 66 66 22 20 6d 6f |r-mode "|Diff" mo|
|00001f20| 64 65 2d 6e 61 6d 65 20 | 22 2d 2d 2d 20 22 20 6d |de-name |"--- " m|
|00001f30| 6f 64 65 2d 6c 69 6e 65 | 2d 6d 6f 64 69 66 69 65 |ode-line|-modifie|
|00001f40| 64 20 28 22 20 22 20 64 | 69 66 66 2d 63 75 72 72 |d (" " d|iff-curr|
|00001f50| 65 6e 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 22 |ent-diff|erence "|
|00001f60| 2f 22 20 64 69 66 66 2d | 74 6f 74 61 6c 2d 64 69 |/" diff-|total-di|
|00001f70| 66 66 65 72 65 6e 63 65 | 73 29 20 6d 6f 64 65 2d |fference|s) mode-|
|00001f80| 6c 69 6e 65 2d 70 72 6f | 63 65 73 73 20 64 69 66 |line-pro|cess dif|
|00001f90| 66 2d 70 61 72 73 65 2d | 68 75 6e 6b 73 20 69 6e |f-parse-|hunks in|
|00001fa0| 74 2d 74 6f 2d 73 74 72 | 69 6e 67 20 64 69 66 66 |t-to-str|ing diff|
|00001fb0| 2d 74 6f 74 61 6c 2d 68 | 75 6e 6b 73 20 64 69 66 |-total-h|unks dif|
|00001fc0| 66 2d 74 6f 74 61 6c 2d | 64 69 66 66 65 72 65 6e |f-total-|differen|
|00001fd0| 63 65 73 5d 20 32 20 28 | 23 24 20 2e 20 36 39 37 |ces] 2 (|#$ . 697|
|00001fe0| 36 29 20 6e 69 6c 5d 29 | 0a 23 40 36 34 20 49 6e |6) nil])|.#@64 In|
|00001ff0| 20 64 69 66 66 2d 6d 6f | 64 65 20 67 6f 20 74 68 | diff-mo|de go th|
|00002000| 65 20 74 68 65 20 62 65 | 67 69 6e 6e 69 6e 67 20 |e the be|ginning |
|00002010| 6f 66 20 74 68 65 20 6e | 65 78 74 20 64 69 66 66 |of the n|ext diff|
|00002020| 65 72 65 6e 63 65 20 68 | 75 6e 6b 2e 1f 0a 28 64 |erence h|unk...(d|
|00002030| 65 66 61 6c 69 61 73 20 | 27 64 69 66 66 2d 6e 65 |efalias |'diff-ne|
|00002040| 78 74 2d 64 69 66 66 65 | 72 65 6e 63 65 20 23 5b |xt-diffe|rence #[|
|00002050| 28 6e 29 20 22 08 c1 55 | ab 85 c2 0b 21 62 87 c4 |(n) "..U|....!b..|
|00002060| 20 64 65 1d 1e 06 1e 07 | c8 8e 7e 88 08 0b 5c 5c | de.....|..~...\\|
|00002070| 89 13 0e 09 56 ab 89 0e | 09 13 ca cb 21 88 aa 8b |....V...|....!...|
|00002080| 0b c1 57 ab 86 c1 13 ca | cc 21 88 cd 0b 21 16 0e |..W.....|.!...!..|
|00002090| c2 0b 21 62 15 cf 0b 21 | 16 06 2c d0 d1 20 21 87 |..!b...!|..,.. !.|
|000020a0| 22 20 5b 6e 20 30 20 64 | 69 66 66 2d 68 75 6e 6b |" [n 0 d|iff-hunk|
|000020b0| 2d 6d 69 6e 20 64 69 66 | 66 2d 63 75 72 72 65 6e |-min dif|f-curren|
|000020c0| 74 2d 68 75 6e 6b 20 64 | 69 66 66 2d 62 75 66 66 |t-hunk d|iff-buff|
|000020d0| 65 72 2d 6e 61 72 72 6f | 77 65 64 2d 70 20 6d 69 |er-narro|wed-p mi|
|000020e0| 6e 20 6d 61 78 20 6e 61 | 72 72 6f 77 20 28 28 62 |n max na|rrow ((b|
|000020f0| 79 74 65 2d 63 6f 64 65 | 20 22 08 ab 84 09 5c 6e |yte-code| "....\n|
|00002100| 7d 88 c3 87 22 20 5b 6e | 61 72 72 6f 77 20 6d 69 |}..." [n|arrow mi|
|00002110| 6e 20 6d 61 78 20 6e 69 | 6c 5d 20 32 29 29 20 64 |n max ni|l] 2)) d|
|00002120| 69 66 66 2d 74 6f 74 61 | 6c 2d 68 75 6e 6b 73 20 |iff-tota|l-hunks |
|00002130| 6d 65 73 73 61 67 65 20 | 22 4e 6f 20 66 6f 6c 6c |message |"No foll|
|00002140| 6f 77 69 6e 67 20 64 69 | 66 66 65 72 65 6e 63 65 |owing di|fference|
|00002150| 20 68 75 6e 6b 73 2e 22 | 20 22 4e 6f 20 70 72 65 | hunks."| "No pre|
|00002160| 63 65 64 69 6e 67 20 64 | 69 66 66 65 72 65 6e 63 |ceding d|ifferenc|
|00002170| 65 20 68 75 6e 6b 73 2e | 22 20 69 6e 74 2d 74 6f |e hunks.|" int-to|
|00002180| 2d 73 74 72 69 6e 67 20 | 64 69 66 66 2d 63 75 72 |-string |diff-cur|
|00002190| 72 65 6e 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |rent-dif|ference |
|000021a0| 64 69 66 66 2d 68 75 6e | 6b 2d 6d 61 78 20 73 65 |diff-hun|k-max se|
|000021b0| 74 2d 62 75 66 66 65 72 | 2d 6d 6f 64 69 66 69 65 |t-buffer|-modifie|
|000021c0| 64 2d 70 20 62 75 66 66 | 65 72 2d 6d 6f 64 69 66 |d-p buff|er-modif|
|000021d0| 69 65 64 2d 70 5d 20 34 | 20 28 23 24 20 2e 20 38 |ied-p] 4| (#$ . 8|
|000021e0| 31 37 34 29 20 22 70 22 | 5d 29 0a 23 40 36 38 20 |174) "p"|]).#@68 |
|000021f0| 49 6e 20 64 69 66 66 2d | 6d 6f 64 65 20 67 6f 20 |In diff-|mode go |
|00002200| 74 68 65 20 74 68 65 20 | 62 65 67 69 6e 6e 69 6e |the the |beginnin|
|00002210| 67 20 6f 66 20 74 68 65 | 20 70 72 65 76 69 6f 75 |g of the| previou|
|00002220| 73 20 64 69 66 66 65 72 | 65 6e 63 65 20 68 75 6e |s differ|ence hun|
|00002230| 6b 2e 1f 0a 28 64 65 66 | 61 6c 69 61 73 20 27 64 |k...(def|alias 'd|
|00002240| 69 66 66 2d 70 72 65 76 | 69 6f 75 73 2d 64 69 66 |iff-prev|ious-dif|
|00002250| 66 65 72 65 6e 63 65 20 | 23 5b 28 6e 29 20 22 c0 |ference |#[(n) ".|
|00002260| 09 5b 21 87 22 20 5b 64 | 69 66 66 2d 6e 65 78 74 |.[!." [d|iff-next|
|00002270| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 6e 5d 20 32 |-differe|nce n] 2|
|00002280| 20 28 23 24 20 2e 20 38 | 36 38 38 29 20 22 70 22 | (#$ . 8|688) "p"|
|00002290| 5d 29 0a 23 40 33 35 20 | 49 6e 20 64 69 66 66 2d |]).#@35 |In diff-|
|000022a0| 6d 6f 64 65 20 67 6f 20 | 74 6f 20 74 68 65 20 6e |mode go |to the n|
|000022b0| 65 78 74 20 6c 69 6e 65 | 2e 1f 0a 28 64 65 66 61 |ext line|...(defa|
|000022c0| 6c 69 61 73 20 27 64 69 | 66 66 2d 6e 65 78 74 2d |lias 'di|ff-next-|
|000022d0| 6c 69 6e 65 20 23 5b 28 | 6e 29 20 22 c0 c1 c2 8f |line #[(|n) "....|
|000022e0| 88 c3 20 87 22 20 5b 6e | 69 6c 20 28 6e 65 78 74 |.. ." [n|il (next|
|000022f0| 2d 6c 69 6e 65 20 6e 29 | 20 28 28 65 72 72 6f 72 |-line n)| ((error|
|00002300| 20 28 62 79 74 65 2d 63 | 6f 64 65 20 22 08 c1 56 | (byte-c|ode "..V|
|00002310| ab 84 c2 c3 21 88 c1 87 | 22 20 5b 6e 20 30 20 6d |....!...|" [n 0 m|
|00002320| 65 73 73 61 67 65 20 22 | 45 6e 64 20 6f 66 20 64 |essage "|End of d|
|00002330| 69 66 66 65 72 65 6e 63 | 65 20 68 75 6e 6b 22 5d |ifferenc|e hunk"]|
|00002340| 20 32 29 29 29 20 64 69 | 66 66 2d 75 70 64 61 74 | 2))) di|ff-updat|
|00002350| 65 2d 6d 6f 64 65 6c 69 | 6e 65 5d 20 33 20 28 23 |e-modeli|ne] 3 (#|
|00002360| 24 20 2e 20 38 38 35 36 | 29 20 22 70 22 5d 29 0a |$ . 8856|) "p"]).|
|00002370| 23 40 33 39 20 49 6e 20 | 64 69 66 66 2d 6d 6f 64 |#@39 In |diff-mod|
|00002380| 65 20 67 6f 20 74 6f 20 | 74 68 65 20 70 72 65 76 |e go to |the prev|
|00002390| 69 6f 75 73 20 6c 69 6e | 65 2e 1f 0a 28 64 65 66 |ious lin|e...(def|
|000023a0| 61 6c 69 61 73 20 27 64 | 69 66 66 2d 70 72 65 76 |alias 'd|iff-prev|
|000023b0| 69 6f 75 73 2d 6c 69 6e | 65 20 23 5b 28 6e 29 20 |ious-lin|e #[(n) |
|000023c0| 22 c0 09 5b 21 87 22 20 | 5b 64 69 66 66 2d 6e 65 |"..[!." |[diff-ne|
|000023d0| 78 74 2d 6c 69 6e 65 20 | 6e 5d 20 32 20 28 23 24 |xt-line |n] 2 (#$|
|000023e0| 20 2e 20 39 30 37 37 29 | 20 22 70 22 5d 29 0a 23 | . 9077)| "p"]).#|
|000023f0| 40 33 38 20 49 6e 20 64 | 69 66 66 2d 6d 6f 64 65 |@38 In d|iff-mode|
|00002400| 20 6d 6f 76 65 20 74 68 | 65 20 70 6f 69 6e 74 20 | move th|e point |
|00002410| 66 6f 72 77 61 72 64 2e | 1f 0a 28 64 65 66 61 6c |forward.|..(defal|
|00002420| 69 61 73 20 27 64 69 66 | 66 2d 66 6f 72 77 61 72 |ias 'dif|f-forwar|
|00002430| 64 2d 63 68 61 72 20 23 | 5b 28 6e 29 20 22 08 75 |d-char #|[(n) ".u|
|00002440| 88 c1 20 87 22 20 5b 6e | 20 64 69 66 66 2d 75 70 |.. ." [n| diff-up|
|00002450| 64 61 74 65 2d 6d 6f 64 | 65 6c 69 6e 65 5d 20 31 |date-mod|eline] 1|
|00002460| 20 28 23 24 20 2e 20 39 | 32 30 34 29 20 22 70 22 | (#$ . 9|204) "p"|
|00002470| 5d 29 0a 23 40 33 39 20 | 49 6e 20 64 69 66 66 2d |]).#@39 |In diff-|
|00002480| 6d 6f 64 65 20 6d 6f 76 | 65 20 74 68 65 20 70 6f |mode mov|e the po|
|00002490| 69 6e 74 20 62 61 63 6b | 77 61 72 64 2e 1f 0a 28 |int back|ward...(|
|000024a0| 64 65 66 61 6c 69 61 73 | 20 27 64 69 66 66 2d 62 |defalias| 'diff-b|
|000024b0| 61 63 6b 77 61 72 64 2d | 63 68 61 72 20 23 5b 28 |ackward-|char #[(|
|000024c0| 6e 29 20 22 c0 09 21 88 | c2 20 87 22 20 5b 62 61 |n) "..!.|. ." [ba|
|000024d0| 63 6b 77 61 72 64 2d 63 | 68 61 72 20 6e 20 64 69 |ckward-c|har n di|
|000024e0| 66 66 2d 75 70 64 61 74 | 65 2d 6d 6f 64 65 6c 69 |ff-updat|e-modeli|
|000024f0| 6e 65 5d 20 32 20 28 23 | 24 20 2e 20 39 33 33 36 |ne] 2 (#|$ . 9336|
|00002500| 29 20 22 70 22 5d 29 0a | 23 40 33 36 20 49 6e 20 |) "p"]).|#@36 In |
|00002510| 64 69 66 66 2d 6d 6f 64 | 65 20 73 63 72 6f 6c 6c |diff-mod|e scroll|
|00002520| 20 74 68 65 20 62 75 66 | 66 65 72 20 75 70 2e 1f | the buf|fer up..|
|00002530| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 64 69 66 66 |.(defali|as 'diff|
|00002540| 2d 73 63 72 6f 6c 6c 2d | 75 70 20 23 5b 28 6e 29 |-scroll-|up #[(n)|
|00002550| 20 22 c0 09 21 88 c2 20 | 87 22 20 5b 73 63 72 6f | "..!.. |." [scro|
|00002560| 6c 6c 2d 75 70 20 6e 20 | 64 69 66 66 2d 75 70 64 |ll-up n |diff-upd|
|00002570| 61 74 65 2d 6d 6f 64 65 | 6c 69 6e 65 5d 20 32 20 |ate-mode|line] 2 |
|00002580| 28 23 24 20 2e 20 39 34 | 38 35 29 20 22 50 22 5d |(#$ . 94|85) "P"]|
|00002590| 29 0a 28 66 73 65 74 20 | 27 64 69 66 66 2d 61 64 |).(fset |'diff-ad|
|000025a0| 76 65 72 74 69 73 65 64 | 2d 73 63 72 6f 6c 6c 2d |vertised|-scroll-|
|000025b0| 75 70 20 27 64 69 66 66 | 2d 73 63 72 6f 6c 6c 2d |up 'diff|-scroll-|
|000025c0| 75 70 29 0a 23 40 33 38 | 20 49 6e 20 64 69 66 66 |up).#@38| In diff|
|000025d0| 2d 6d 6f 64 65 20 73 63 | 72 6f 6c 6c 20 74 68 65 |-mode sc|roll the|
|000025e0| 20 62 75 66 66 65 72 20 | 64 6f 77 6e 2e 1f 0a 28 | buffer |down...(|
|000025f0| 64 65 66 61 6c 69 61 73 | 20 27 64 69 66 66 2d 73 |defalias| 'diff-s|
|00002600| 63 72 6f 6c 6c 2d 64 6f | 77 6e 20 23 5b 28 6e 29 |croll-do|wn #[(n)|
|00002610| 20 22 c0 09 21 88 c2 20 | 87 22 20 5b 73 63 72 6f | "..!.. |." [scro|
|00002620| 6c 6c 2d 64 6f 77 6e 20 | 6e 20 64 69 66 66 2d 75 |ll-down |n diff-u|
|00002630| 70 64 61 74 65 2d 6d 6f | 64 65 6c 69 6e 65 5d 20 |pdate-mo|deline] |
|00002640| 32 20 28 23 24 20 2e 20 | 39 36 37 33 29 20 22 50 |2 (#$ . |9673) "P|
|00002650| 22 5d 29 0a 28 66 73 65 | 74 20 27 64 69 66 66 2d |"]).(fse|t 'diff-|
|00002660| 61 64 76 65 72 74 69 73 | 65 64 2d 73 63 72 6f 6c |advertis|ed-scrol|
|00002670| 6c 2d 64 6f 77 6e 20 27 | 64 69 66 66 2d 73 63 72 |l-down '|diff-scr|
|00002680| 6f 6c 6c 2d 64 6f 77 6e | 29 0a 23 40 34 39 20 49 |oll-down|).#@49 I|
|00002690| 6e 20 64 69 66 66 2d 6d | 6f 64 65 20 67 6f 20 74 |n diff-m|ode go t|
|000026a0| 6f 20 74 68 65 20 62 65 | 67 69 6e 6e 69 6e 67 20 |o the be|ginning |
|000026b0| 6f 66 20 74 68 65 20 62 | 75 66 66 65 72 2e 1f 0a |of the b|uffer...|
|000026c0| 28 64 65 66 61 6c 69 61 | 73 20 27 64 69 66 66 2d |(defalia|s 'diff-|
|000026d0| 62 65 67 69 6e 6e 69 6e | 67 2d 6f 66 2d 62 75 66 |beginnin|g-of-buf|
|000026e0| 66 65 72 20 23 5b 28 6e | 29 20 22 c0 09 21 88 c2 |fer #[(n|) "..!..|
|000026f0| 20 87 22 20 5b 62 65 67 | 69 6e 6e 69 6e 67 2d 6f | ." [beg|inning-o|
|00002700| 66 2d 62 75 66 66 65 72 | 20 6e 20 64 69 66 66 2d |f-buffer| n diff-|
|00002710| 75 70 64 61 74 65 2d 6d | 6f 64 65 6c 69 6e 65 5d |update-m|odeline]|
|00002720| 20 32 20 28 23 24 20 2e | 20 39 38 37 31 29 20 22 | 2 (#$ .| 9871) "|
|00002730| 50 22 5d 29 0a 23 40 34 | 33 20 49 6e 20 64 69 66 |P"]).#@4|3 In dif|
|00002740| 66 2d 6d 6f 64 65 20 67 | 6f 20 74 6f 20 74 68 65 |f-mode g|o to the|
|00002750| 20 65 6e 64 20 6f 66 20 | 74 68 65 20 62 75 66 66 | end of |the buff|
|00002760| 65 72 2e 1f 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |er...(de|falias '|
|00002770| 64 69 66 66 2d 65 6e 64 | 2d 6f 66 2d 62 75 66 66 |diff-end|-of-buff|
|00002780| 65 72 20 23 5b 28 6e 29 | 20 22 c0 09 21 88 c2 20 |er #[(n)| "..!.. |
|00002790| 87 22 20 5b 65 6e 64 2d | 6f 66 2d 62 75 66 66 65 |." [end-|of-buffe|
|000027a0| 72 20 6e 20 64 69 66 66 | 2d 75 70 64 61 74 65 2d |r n diff|-update-|
|000027b0| 6d 6f 64 65 6c 69 6e 65 | 5d 20 32 20 28 23 24 20 |modeline|] 2 (#$ |
|000027c0| 2e 20 31 30 30 34 32 29 | 20 22 50 22 5d 29 0a 23 |. 10042)| "P"]).#|
|000027d0| 40 31 37 39 20 46 69 6e | 64 20 61 6e 64 20 64 69 |@179 Fin|d and di|
|000027e0| 73 70 6c 61 79 20 74 68 | 65 20 64 69 66 66 65 72 |splay th|e differ|
|000027f0| 65 6e 63 65 73 20 62 65 | 74 77 65 65 6e 20 4f 4c |ences be|tween OL|
|00002800| 44 20 61 6e 64 20 4e 45 | 57 20 66 69 6c 65 73 2e |D and NE|W files.|
|00002810| 0a 49 6e 74 65 72 61 63 | 74 69 76 65 6c 79 20 79 |.Interac|tively y|
|00002820| 6f 75 20 61 72 65 20 70 | 72 6f 6d 70 74 65 64 20 |ou are p|rompted |
|00002830| 77 69 74 68 20 74 68 65 | 20 63 75 72 72 65 6e 74 |with the| current|
|00002840| 20 62 75 66 66 65 72 27 | 73 20 66 69 6c 65 20 6e | buffer'|s file n|
|00002850| 61 6d 65 20 66 6f 72 20 | 4e 45 57 0a 61 6e 64 20 |ame for |NEW.and |
|00002860| 77 68 61 74 20 61 70 70 | 65 61 72 73 20 74 6f 20 |what app|ears to |
|00002870| 62 65 20 69 74 73 20 62 | 61 63 6b 75 70 20 66 6f |be its b|ackup fo|
|00002880| 72 20 4f 4c 44 2e 1f 0a | 28 64 65 66 61 6c 69 61 |r OLD...|(defalia|
|00002890| 73 20 27 64 69 66 66 20 | 23 5b 28 6f 6c 64 20 6e |s 'diff |#[(old n|
|000028a0| 65 77 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 77 69 |ew &opti|onal swi|
|000028b0| 74 63 68 65 73 29 20 22 | c0 09 ae 81 5c 6e 21 11 |tches) "|....\n!.|
|000028c0| c3 0c 21 14 c3 0d 21 15 | 70 c6 89 89 89 89 89 1e |..!...!.|p.......|
|000028d0| 07 1e 08 1e 09 1e 5c 6e | 1e 0b 1e 0c 1e 0d ce 0c |......\n|........|
|000028e0| 21 ce 0d 21 1e 0f 1e 10 | 0e 0f ac 84 0e 10 ab 9d |!..!....|........|
|000028f0| 0e 0f ac 89 c3 d1 0d 21 | 0c 5c 22 14 aa 90 0e 10 |.......!|.\".....|
|00002900| ac 89 c3 d1 0c 21 0d 5c | 22 15 aa 83 d2 16 0c 2a |.....!.\|"......*|
|00002910| d3 d4 d5 d6 09 d7 23 0c | 0d 24 88 0e 0c ab 88 c6 |......#.|.$......|
|00002920| 16 18 c6 16 19 aa a8 da | 0e 1b dc 50 21 16 0b da |........|...P!...|
|00002930| 0e 1b dd 50 21 16 5c 6e | de 0c 21 16 09 de 0d 21 |...P!.\n|..!....!|
|00002940| 16 08 0c 0e 09 41 42 16 | 18 0d 0e 08 41 42 16 19 |.....AB.|....AB..|
|00002950| c6 1e 1f e0 e1 09 5c 22 | 88 29 e2 8e 0e 07 0e 23 |......\"|.).....#|
|00002960| b7 1e 24 e5 e6 21 71 88 | e7 0d 21 16 28 e9 0e 24 |..$..!q.|..!.(..$|
|00002970| 38 16 2a eb 0e 24 38 16 | 2c 0e 24 41 40 16 2d c6 |8.*..$8.|,.$A@.-.|
|00002980| 1e 2e ef f0 21 ab 86 f0 | 70 21 88 aa 84 f0 70 21 |....!...|p!....p!|
|00002990| 88 7e 88 f1 20 88 0e 0c | ab 90 f2 09 0c 89 0d 89 |.~.. ...|........|
|000029a0| 25 88 0e 2d f3 50 16 2d | aa a8 8a 0e 09 40 71 88 |%..-.P.-|.....@q.|
|000029b0| f4 65 64 0e 0b c6 f5 25 | 88 0e 08 40 71 88 f4 65 |.ed....%|...@q..e|
|000029c0| 64 0e 5c 6e c6 f5 25 88 | 29 f2 09 0c 0e 0b 0d 0e |d.\n..%.|).......|
|000029d0| 5c 6e 25 88 0e 0c ac 91 | 0e 07 f6 73 ab 8b f7 0c |\n%.....|...s....|
|000029e0| 0e 0b 0d 0e 5c 6e 0e 2d | 25 88 f8 20 88 65 62 88 |....\n.-|%.. .eb.|
|000029f0| f9 16 3a fb 16 3c 0e 3d | fb 55 ab 88 fe 20 88 d3 |..:..<.=|.U... ..|
|00002a00| ff 21 aa a9 0e 40 ab 88 | 60 81 41 00 fb 21 7d 88 |.!...@..|`.A..!}.|
|00002a10| 81 42 00 70 21 88 d3 81 | 43 00 0e 44 0e 3d 81 45 |.B.p!...|C..D.=.E|
|00002a20| 00 55 ab 85 81 46 00 aa | 83 81 47 00 23 2e 5c 6e |.U...F..|..G.#.\n|
|00002a30| 87 22 20 5b 64 69 66 66 | 2d 66 69 78 2d 73 77 69 |." [diff|-fix-swi|
|00002a40| 74 63 68 65 73 20 73 77 | 69 74 63 68 65 73 20 64 |tches sw|itches d|
|00002a50| 69 66 66 2d 73 77 69 74 | 63 68 65 73 20 65 78 70 |iff-swit|ches exp|
|00002a60| 61 6e 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 6f 6c |and-file|-name ol|
|00002a70| 64 20 6e 65 77 20 6e 69 | 6c 20 66 6c 61 67 20 6e |d new ni|l flag n|
|00002a80| 65 77 2d 62 75 66 66 65 | 72 20 6f 6c 64 2d 62 75 |ew-buffe|r old-bu|
|00002a90| 66 66 65 72 20 6e 65 77 | 2d 74 65 6d 70 20 6f 6c |ffer new|-temp ol|
|00002aa0| 64 2d 74 65 6d 70 20 64 | 6f 69 6e 67 2d 64 69 72 |d-temp d|oing-dir|
|00002ab0| 73 20 63 75 72 72 2d 62 | 75 66 66 20 66 69 6c 65 |s curr-b|uff file|
|00002ac0| 2d 64 69 72 65 63 74 6f | 72 79 2d 70 20 66 64 70 |-directo|ry-p fdp|
|00002ad0| 2d 6e 65 77 20 66 64 70 | 2d 6f 6c 64 20 66 69 6c |-new fdp|-old fil|
|00002ae0| 65 2d 6e 61 6d 65 2d 6e | 6f 6e 64 69 72 65 63 74 |e-name-n|ondirect|
|00002af0| 6f 72 79 20 74 20 6d 65 | 73 73 61 67 65 20 22 64 |ory t me|ssage "d|
|00002b00| 69 66 66 20 25 73 20 25 | 73 20 25 73 2e 2e 2e 22 |iff %s %|s %s..."|
|00002b10| 20 6d 61 70 63 6f 6e 63 | 61 74 20 69 64 65 6e 74 | mapconc|at ident|
|00002b20| 69 74 79 20 22 20 22 20 | 64 69 66 66 2d 6f 6c 64 |ity " " |diff-old|
|00002b30| 2d 66 69 6c 65 20 64 69 | 66 66 2d 6e 65 77 2d 66 |-file di|ff-new-f|
|00002b40| 69 6c 65 20 6d 61 6b 65 | 2d 74 65 6d 70 2d 6e 61 |ile make|-temp-na|
|00002b50| 6d 65 20 64 69 66 66 2d | 74 65 6d 70 2d 74 65 6d |me diff-|temp-tem|
|00002b60| 70 6c 61 74 65 20 22 31 | 22 20 22 32 22 20 64 69 |plate "1|" "2" di|
|00002b70| 66 66 2d 67 65 74 2d 66 | 69 6c 65 2d 62 75 66 66 |ff-get-f|ile-buff|
|00002b80| 65 72 20 63 61 73 65 2d | 66 6f 6c 64 2d 73 65 61 |er case-|fold-sea|
|00002b90| 72 63 68 20 6d 61 70 63 | 61 72 20 23 5b 28 78 29 |rch mapc|ar #[(x)|
|00002ba0| 20 22 c0 c1 5c 6e 5c 22 | ad 86 5c 6e c3 94 48 89 | "..\n\"|..\n..H.|
|00002bb0| 14 87 22 20 5b 73 74 72 | 69 6e 67 2d 6d 61 74 63 |.." [str|ing-matc|
|00002bc0| 68 20 22 5b 65 63 75 5d | 22 20 78 20 30 20 66 6c |h "[ecu]|" x 0 fl|
|00002bd0| 61 67 5d 20 33 5d 20 28 | 28 62 79 74 65 2d 63 6f |ag] 3] (|(byte-co|
|00002be0| 64 65 20 22 c0 c1 c2 8f | 88 c0 c3 c4 8f 88 0d 71 |de "....|.......q|
|00002bf0| 87 22 20 5b 6e 69 6c 20 | 28 64 65 6c 65 74 65 2d |." [nil |(delete-|
|00002c00| 66 69 6c 65 20 6f 6c 64 | 2d 74 65 6d 70 29 20 28 |file old|-temp) (|
|00002c10| 28 65 72 72 6f 72 29 29 | 20 28 64 65 6c 65 74 65 |(error))| (delete|
|00002c20| 2d 66 69 6c 65 20 6e 65 | 77 2d 74 65 6d 70 29 20 |-file ne|w-temp) |
|00002c30| 28 28 65 72 72 6f 72 29 | 29 20 63 75 72 72 2d 62 |((error)|) curr-b|
|00002c40| 75 66 66 5d 20 33 29 29 | 20 64 69 66 66 2d 73 65 |uff] 3))| diff-se|
|00002c50| 61 72 63 68 2d 70 61 74 | 74 65 72 6e 2d 61 6c 69 |arch-pat|tern-ali|
|00002c60| 73 74 20 70 61 74 74 65 | 72 6e 73 20 67 65 74 2d |st patte|rns get-|
|00002c70| 62 75 66 66 65 72 2d 63 | 72 65 61 74 65 20 22 2a |buffer-c|reate "*|
|00002c80| 44 69 66 66 20 4f 75 74 | 70 75 74 2a 22 20 66 69 |Diff Out|put*" fi|
|00002c90| 6c 65 2d 6e 61 6d 65 2d | 64 69 72 65 63 74 6f 72 |le-name-|director|
|00002ca0| 79 20 64 65 66 61 75 6c | 74 2d 64 69 72 65 63 74 |y defaul|t-direct|
|00002cb0| 6f 72 79 20 32 20 64 69 | 66 66 2d 6f 6c 64 2d 66 |ory 2 di|ff-old-f|
|00002cc0| 69 6c 65 2d 70 61 74 74 | 65 72 6e 20 33 20 64 69 |ile-patt|ern 3 di|
|00002cd0| 66 66 2d 6e 65 77 2d 66 | 69 6c 65 2d 70 61 74 74 |ff-new-f|ile-patt|
|00002ce0| 65 72 6e 20 64 69 66 66 | 2d 68 75 6e 6b 2d 70 61 |ern diff|-hunk-pa|
|00002cf0| 74 74 65 72 6e 20 62 75 | 66 66 65 72 2d 72 65 61 |ttern bu|ffer-rea|
|00002d00| 64 2d 6f 6e 6c 79 20 66 | 62 6f 75 6e 64 70 20 62 |d-only f|boundp b|
|00002d10| 75 66 66 65 72 2d 64 69 | 73 61 62 6c 65 2d 75 6e |uffer-di|sable-un|
|00002d20| 64 6f 20 65 72 61 73 65 | 2d 62 75 66 66 65 72 20 |do erase|-buffer |
|00002d30| 64 69 66 66 2d 72 75 6e | 2d 64 69 66 66 20 22 5c |diff-run|-diff "\|
|00002d40| 5c 7c 5e 4f 6e 6c 79 20 | 69 6e 20 22 20 77 72 69 |\|^Only |in " wri|
|00002d50| 74 65 2d 72 65 67 69 6f | 6e 20 71 75 69 65 74 20 |te-regio|n quiet |
|00002d60| 28 3f 63 20 3f 75 29 20 | 64 69 66 66 2d 66 69 78 |(?c ?u) |diff-fix|
|00002d70| 2d 66 69 6c 65 2d 6e 61 | 6d 65 73 20 64 69 66 66 |-file-na|mes diff|
|00002d80| 2d 6d 6f 64 65 20 22 30 | 22 20 64 69 66 66 2d 63 |-mode "0|" diff-c|
|00002d90| 75 72 72 65 6e 74 2d 64 | 69 66 66 65 72 65 6e 63 |urrent-d|ifferenc|
|00002da0| 65 20 30 20 64 69 66 66 | 2d 63 75 72 72 65 6e 74 |e 0 diff|-current|
|00002db0| 2d 68 75 6e 6b 20 64 69 | 66 66 2d 74 6f 74 61 6c |-hunk di|ff-total|
|00002dc0| 2d 68 75 6e 6b 73 20 64 | 69 66 66 2d 63 6c 65 61 |-hunks d|iff-clea|
|00002dd0| 6e 75 70 2d 62 75 66 66 | 65 72 73 20 22 4e 6f 20 |nup-buff|ers "No |
|00002de0| 64 69 66 66 65 72 65 6e | 63 65 73 22 20 64 69 66 |differen|ces" dif|
|00002df0| 66 2d 64 6f 2d 6e 61 72 | 72 6f 77 20 64 69 66 66 |f-do-nar|row diff|
|00002e00| 2d 68 75 6e 6b 2d 6d 61 | 78 20 64 69 73 70 6c 61 |-hunk-ma|x displa|
|00002e10| 79 2d 62 75 66 66 65 72 | 20 22 25 73 20 64 69 66 |y-buffer| "%s dif|
|00002e20| 66 65 72 65 6e 63 65 20 | 68 75 6e 6b 25 73 22 20 |ference |hunk%s" |
|00002e30| 64 69 66 66 2d 74 6f 74 | 61 6c 2d 64 69 66 66 65 |diff-tot|al-diffe|
|00002e40| 72 65 6e 63 65 73 20 31 | 20 22 22 20 22 73 22 5d |rences 1| "" "s"]|
|00002e50| 20 37 20 28 23 24 20 2e | 20 31 30 31 39 37 29 20 | 7 (#$ .| 10197) |
|00002e60| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 c2 c3 |(byte-co|de "....|
|00002e70| c4 20 24 87 22 20 5b 64 | 69 66 66 2d 72 65 61 64 |. $." [d|iff-read|
|00002e80| 2d 61 72 67 73 20 22 44 | 69 66 66 20 6f 72 69 67 |-args "D|iff orig|
|00002e90| 69 6e 61 6c 20 66 69 6c | 65 20 28 25 73 29 20 22 |inal fil|e (%s) "|
|00002ea0| 20 22 44 69 66 66 20 6e | 65 77 20 66 69 6c 65 20 | "Diff n|ew file |
|00002eb0| 28 25 73 29 20 22 20 22 | 53 77 69 74 63 68 65 73 |(%s) " "|Switches|
|00002ec0| 20 66 6f 72 20 64 69 66 | 66 20 28 25 73 29 20 22 | for dif|f (%s) "|
|00002ed0| 20 62 75 66 66 65 72 2d | 66 69 6c 65 2d 6e 61 6d | buffer-|file-nam|
|00002ee0| 65 5d 20 35 29 5d 29 0a | 23 40 32 32 30 20 44 69 |e] 5)]).|#@220 Di|
|00002ef0| 66 66 20 74 68 69 73 20 | 66 69 6c 65 20 77 69 74 |ff this |file wit|
|00002f00| 68 20 69 74 73 20 62 61 | 63 6b 75 70 20 66 69 6c |h its ba|ckup fil|
|00002f10| 65 20 6f 72 20 76 69 63 | 65 20 76 65 72 73 61 2e |e or vic|e versa.|
|00002f20| 0a 55 73 65 73 20 74 68 | 65 20 6c 61 74 65 73 74 |.Uses th|e latest|
|00002f30| 20 62 61 63 6b 75 70 2c | 20 69 66 20 74 68 65 72 | backup,| if ther|
|00002f40| 65 20 61 72 65 20 73 65 | 76 65 72 61 6c 20 6e 75 |e are se|veral nu|
|00002f50| 6d 65 72 69 63 61 6c 20 | 62 61 63 6b 75 70 73 2e |merical |backups.|
|00002f60| 0a 49 66 20 74 68 69 73 | 20 66 69 6c 65 20 69 73 |.If this| file is|
|00002f70| 20 61 20 62 61 63 6b 75 | 70 2c 20 64 69 66 66 20 | a backu|p, diff |
|00002f80| 69 74 20 77 69 74 68 20 | 69 74 73 20 6f 72 69 67 |it with |its orig|
|00002f90| 69 6e 61 6c 2e 0a 54 68 | 65 20 62 61 63 6b 75 70 |inal..Th|e backup|
|00002fa0| 20 66 69 6c 65 20 69 73 | 20 74 68 65 20 66 69 72 | file is| the fir|
|00002fb0| 73 74 20 66 69 6c 65 20 | 67 69 76 65 6e 20 74 6f |st file |given to|
|00002fc0| 20 60 64 69 66 66 27 2e | 1f 0a 28 64 65 66 61 6c | `diff'.|..(defal|
|00002fd0| 69 61 73 20 27 64 69 66 | 66 2d 62 61 63 6b 75 70 |ias 'dif|f-backup|
|00002fe0| 20 23 5b 28 66 69 6c 65 | 20 26 6f 70 74 69 6f 6e | #[(file| &option|
|00002ff0| 61 6c 20 73 77 69 74 63 | 68 65 73 29 20 22 c0 89 |al switc|hes) "..|
|00003000| 19 1a c3 0c 21 ab 88 0c | 12 c5 0c 21 11 aa 8c c6 |....!...|...!....|
|00003010| 0c 21 ae 84 c7 c8 0c 5c | 22 12 0c 11 c9 5c 6e 09 |.!.....\|"....\n.|
|00003020| 0e 5c 6e 23 2a 87 22 20 | 5b 6e 69 6c 20 6f 72 69 |.\n#*." |[nil ori|
|00003030| 20 62 61 6b 20 62 61 63 | 6b 75 70 2d 66 69 6c 65 | bak bac|kup-file|
|00003040| 2d 6e 61 6d 65 2d 70 20 | 66 69 6c 65 20 66 69 6c |-name-p |file fil|
|00003050| 65 2d 6e 61 6d 65 2d 73 | 61 6e 73 2d 76 65 72 73 |e-name-s|ans-vers|
|00003060| 69 6f 6e 73 20 64 69 66 | 66 2d 6c 61 74 65 73 74 |ions dif|f-latest|
|00003070| 2d 62 61 63 6b 75 70 2d | 66 69 6c 65 20 65 72 72 |-backup-|file err|
|00003080| 6f 72 20 22 4e 6f 20 62 | 61 63 6b 75 70 20 66 6f |or "No b|ackup fo|
|00003090| 75 6e 64 20 66 6f 72 20 | 25 73 22 20 64 69 66 66 |und for |%s" diff|
|000030a0| 20 73 77 69 74 63 68 65 | 73 5d 20 34 20 28 23 24 | switche|s] 4 (#$|
|000030b0| 20 2e 20 31 32 30 31 34 | 29 20 28 6c 69 73 74 20 | . 12014|) (list |
|000030c0| 28 72 65 61 64 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |(read-fi|le-name |
|000030d0| 22 44 69 66 66 20 28 66 | 69 6c 65 20 77 69 74 68 |"Diff (f|ile with|
|000030e0| 20 62 61 63 6b 75 70 29 | 3a 20 22 29 20 28 61 6e | backup)|: ") (an|
|000030f0| 64 20 63 75 72 72 65 6e | 74 2d 70 72 65 66 69 78 |d curren|t-prefix|
|00003100| 2d 61 72 67 20 28 64 69 | 66 66 2d 72 65 61 64 2d |-arg (di|ff-read-|
|00003110| 73 77 69 74 63 68 65 73 | 20 22 44 69 66 66 20 73 |switches| "Diff s|
|00003120| 77 69 74 63 68 65 73 3a | 20 22 29 29 29 5d 29 0a |witches:| ")))]).|
|00003130| 23 40 34 35 20 53 68 6f | 77 20 64 69 66 66 65 72 |#@45 Sho|w differ|
|00003140| 65 6e 63 65 20 6e 75 6d | 62 65 72 20 4e 20 28 70 |ence num|ber N (p|
|00003150| 72 65 66 69 78 20 61 72 | 67 75 6d 65 6e 74 29 2e |refix ar|gument).|
|00003160| 1f 0a 28 64 65 66 61 6c | 69 61 73 20 27 64 69 66 |..(defal|ias 'dif|
|00003170| 66 2d 73 68 6f 77 2d 64 | 69 66 66 65 72 65 6e 63 |f-show-d|ifferenc|
|00003180| 65 20 23 5b 28 6e 29 20 | 22 c0 20 c1 5c 6e 21 c3 |e #[(n) |". .\n!.|
|00003190| 5c 6e 21 1c 1d 1e 06 c7 | 8e 7e 88 0e 08 c9 57 ab |\n!.....|.~....W.|
|000031a0| 89 ca cb 21 88 c9 16 08 | aa 91 0e 08 0e 0c 56 ab |...!....|......V.|
|000031b0| 8a ca cd 0e 08 5c 22 88 | 0e 0c 16 08 0e 08 12 ce |.....\".|........|
|000031c0| 5c 6e 21 16 0f c1 0e 08 | 21 15 c3 0e 08 21 14 0d |\n!.....|!....!..|
|000031d0| 62 2c 87 22 20 5b 64 69 | 66 66 2d 62 75 66 66 65 |b,." [di|ff-buffe|
|000031e0| 72 2d 6e 61 72 72 6f 77 | 65 64 2d 70 20 64 69 66 |r-narrow|ed-p dif|
|000031f0| 66 2d 68 75 6e 6b 2d 6d | 69 6e 20 64 69 66 66 2d |f-hunk-m|in diff-|
|00003200| 63 75 72 72 65 6e 74 2d | 68 75 6e 6b 20 64 69 66 |current-|hunk dif|
|00003210| 66 2d 68 75 6e 6b 2d 6d | 61 78 20 6d 61 78 20 6d |f-hunk-m|ax max m|
|00003220| 69 6e 20 6e 61 72 72 6f | 77 65 64 70 20 28 28 62 |in narro|wedp ((b|
|00003230| 79 74 65 2d 63 6f 64 65 | 20 22 08 ab 84 09 5c 6e |yte-code| "....\n|
|00003240| 7d 88 c3 c4 20 21 87 22 | 20 5b 6e 61 72 72 6f 77 |}... !."| [narrow|
|00003250| 65 64 70 20 6d 69 6e 20 | 6d 61 78 20 73 65 74 2d |edp min |max set-|
|00003260| 62 75 66 66 65 72 2d 6d | 6f 64 69 66 69 65 64 2d |buffer-m|odified-|
|00003270| 70 20 62 75 66 66 65 72 | 2d 6d 6f 64 69 66 69 65 |p buffer|-modifie|
|00003280| 64 2d 70 5d 20 32 29 29 | 20 6e 20 30 20 6d 65 73 |d-p] 2))| n 0 mes|
|00003290| 73 61 67 65 20 22 4e 6f | 20 6e 65 67 61 74 69 76 |sage "No| negativ|
|000032a0| 65 20 68 75 6e 6b 73 2e | 22 20 64 69 66 66 2d 74 |e hunks.|" diff-t|
|000032b0| 6f 74 61 6c 2d 68 75 6e | 6b 73 20 22 4e 6f 20 68 |otal-hun|ks "No h|
|000032c0| 75 6e 6b 20 25 64 2e 22 | 20 69 6e 74 2d 74 6f 2d |unk %d."| int-to-|
|000032d0| 73 74 72 69 6e 67 20 64 | 69 66 66 2d 63 75 72 72 |string d|iff-curr|
|000032e0| 65 6e 74 2d 64 69 66 66 | 65 72 65 6e 63 65 5d 20 |ent-diff|erence] |
|000032f0| 34 20 28 23 24 20 2e 20 | 31 32 35 39 37 29 20 22 |4 (#$ . |12597) "|
|00003300| 70 22 5d 29 0a 23 40 32 | 31 20 53 68 6f 77 20 60 |p"]).#@2|1 Show `|
|00003310| 64 69 66 66 2d 68 65 61 | 64 65 72 27 2e 1f 0a 28 |diff-hea|der'...(|
|00003320| 64 65 66 61 6c 69 61 73 | 20 27 64 69 66 66 2d 73 |defalias| 'diff-s|
|00003330| 68 6f 77 2d 68 65 61 64 | 65 72 20 23 5b 6e 69 6c |how-head|er #[nil|
|00003340| 20 22 c0 90 c1 8c 7e 88 | c2 c3 21 c4 c3 21 7b 29 | "....~.|..!..!{)|
|00003350| 21 91 87 22 20 5b 22 2a | 44 69 66 66 20 48 65 61 |!.." ["*|Diff Hea|
|00003360| 64 65 72 2a 22 20 70 72 | 69 6e 63 20 64 69 66 66 |der*" pr|inc diff|
|00003370| 2d 68 75 6e 6b 2d 6d 69 | 6e 20 30 20 64 69 66 66 |-hunk-mi|n 0 diff|
|00003380| 2d 68 75 6e 6b 2d 6d 61 | 78 5d 20 35 20 28 23 24 |-hunk-ma|x] 5 (#$|
|00003390| 20 2e 20 31 33 30 36 36 | 29 20 6e 69 6c 5d 29 0a | . 13066|) nil]).|
|000033a0| 23 40 31 33 39 20 56 69 | 73 69 74 20 64 69 66 66 |#@139 Vi|sit diff|
|000033b0| 65 64 20 66 69 6c 65 2c | 20 61 74 20 74 68 65 20 |ed file,| at the |
|000033c0| 70 6f 69 6e 74 20 63 6f | 72 72 65 73 70 6f 6e 64 |point co|rrespond|
|000033d0| 69 6e 67 20 74 6f 20 74 | 68 65 20 63 75 72 72 65 |ing to t|he curre|
|000033e0| 6e 74 20 68 75 6e 6b 2e | 0a 44 65 66 61 75 6c 74 |nt hunk.|.Default|
|000033f0| 20 69 73 20 74 6f 20 76 | 69 73 69 74 20 74 68 65 | is to v|isit the|
|00003400| 20 6e 65 77 20 66 69 6c | 65 3b 20 70 72 65 66 69 | new fil|e; prefi|
|00003410| 78 20 6d 65 61 6e 73 20 | 76 69 73 69 74 20 6f 6c |x means |visit ol|
|00003420| 64 20 66 69 6c 65 20 69 | 6e 73 74 65 61 64 2e 1f |d file i|nstead..|
|00003430| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 64 69 66 66 |.(defali|as 'diff|
|00003440| 2d 66 69 6e 64 2d 66 69 | 6c 65 20 23 5b 28 6f 6c |-find-fi|le #[(ol|
|00003450| 64 2d 66 69 6c 65 2d 70 | 29 20 22 c0 09 21 1a c3 |d-file-p|) "..!..|
|00003460| 09 ab 84 0c 40 aa 82 0d | 40 21 88 c6 5c 6e 21 88 |....@...|@!..\n!.|
|00003470| c7 c8 21 29 87 22 20 5b | 64 69 66 66 2d 66 69 6c |..!)." [|diff-fil|
|00003480| 65 2d 6c 69 6e 65 20 6f | 6c 64 2d 66 69 6c 65 2d |e-line o|ld-file-|
|00003490| 70 20 6c 69 6e 65 20 66 | 69 6e 64 2d 66 69 6c 65 |p line f|ind-file|
|000034a0| 20 64 69 66 66 2d 6f 6c | 64 2d 66 69 6c 65 20 64 | diff-ol|d-file d|
|000034b0| 69 66 66 2d 6e 65 77 2d | 66 69 6c 65 20 67 6f 74 |iff-new-|file got|
|000034c0| 6f 2d 6c 69 6e 65 20 72 | 65 63 65 6e 74 65 72 20 |o-line r|ecenter |
|000034d0| 30 5d 20 32 20 28 23 24 | 20 2e 20 31 33 32 32 32 |0] 2 (#$| . 13222|
|000034e0| 29 20 22 50 22 5d 29 0a | 23 40 31 35 31 20 56 69 |) "P"]).|#@151 Vi|
|000034f0| 73 69 74 20 74 68 65 20 | 64 69 66 66 65 64 20 66 |sit the |diffed f|
|00003500| 69 6c 65 20 69 6e 20 6f | 74 68 65 72 20 77 69 6e |ile in o|ther win|
|00003510| 64 6f 77 2c 20 77 69 74 | 68 20 74 68 65 20 70 6f |dow, wit|h the po|
|00003520| 69 6e 74 20 61 74 20 74 | 68 65 20 63 75 72 72 65 |int at t|he curre|
|00003530| 6e 74 20 68 75 6e 6b 2e | 0a 44 65 66 61 75 6c 74 |nt hunk.|.Default|
|00003540| 20 69 73 20 74 6f 20 76 | 69 73 69 74 20 74 68 65 | is to v|isit the|
|00003550| 20 6e 65 77 20 66 69 6c | 65 3b 20 70 72 65 66 69 | new fil|e; prefi|
|00003560| 78 20 6d 65 61 6e 73 20 | 76 69 73 69 74 20 74 68 |x means |visit th|
|00003570| 65 20 6f 6c 64 20 66 69 | 6c 65 20 69 6e 73 74 65 |e old fi|le inste|
|00003580| 61 64 2e 1f 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |ad...(de|falias '|
|00003590| 64 69 66 66 2d 66 69 6e | 64 2d 66 69 6c 65 2d 6f |diff-fin|d-file-o|
|000035a0| 74 68 65 72 2d 77 69 6e | 64 6f 77 20 23 5b 28 6f |ther-win|dow #[(o|
|000035b0| 6c 64 2d 66 69 6c 65 2d | 70 29 20 22 c0 09 21 1a |ld-file-|p) "..!.|
|000035c0| c3 09 ab 84 0c 40 aa 82 | 0d 40 21 88 c6 5c 6e 21 |.....@..|.@!..\n!|
|000035d0| 88 c7 c8 21 29 87 22 20 | 5b 64 69 66 66 2d 66 69 |...!)." |[diff-fi|
|000035e0| 6c 65 2d 6c 69 6e 65 20 | 6f 6c 64 2d 66 69 6c 65 |le-line |old-file|
|000035f0| 2d 70 20 6c 69 6e 65 20 | 66 69 6e 64 2d 66 69 6c |-p line |find-fil|
|00003600| 65 2d 6f 74 68 65 72 2d | 77 69 6e 64 6f 77 20 64 |e-other-|window d|
|00003610| 69 66 66 2d 6f 6c 64 2d | 66 69 6c 65 20 64 69 66 |iff-old-|file dif|
|00003620| 66 2d 6e 65 77 2d 66 69 | 6c 65 20 67 6f 74 6f 2d |f-new-fi|le goto-|
|00003630| 6c 69 6e 65 20 72 65 63 | 65 6e 74 65 72 20 30 5d |line rec|enter 0]|
|00003640| 20 32 20 28 23 24 20 2e | 20 31 33 35 35 30 29 20 | 2 (#$ .| 13550) |
|00003650| 22 50 22 5d 29 0a 23 40 | 31 34 36 20 56 69 73 69 |"P"]).#@|146 Visi|
|00003660| 74 20 74 68 65 20 64 69 | 66 66 65 64 20 66 69 6c |t the di|ffed fil|
|00003670| 65 20 69 6e 20 6f 74 68 | 65 72 20 66 72 61 6d 65 |e in oth|er frame|
|00003680| 2c 20 77 69 74 68 20 70 | 6f 69 6e 74 20 61 74 20 |, with p|oint at |
|00003690| 74 68 65 20 63 75 72 72 | 65 6e 74 20 68 75 6e 6b |the curr|ent hunk|
|000036a0| 2e 0a 44 65 66 61 75 6c | 74 20 69 73 20 74 6f 20 |..Defaul|t is to |
|000036b0| 76 69 73 69 74 20 74 68 | 65 20 6e 65 77 20 66 69 |visit th|e new fi|
|000036c0| 6c 65 3b 20 70 72 65 66 | 69 78 20 6d 65 61 6e 73 |le; pref|ix means|
|000036d0| 20 76 69 73 69 74 20 74 | 68 65 20 6f 6c 64 20 66 | visit t|he old f|
|000036e0| 69 6c 65 20 69 6e 73 74 | 65 61 64 2e 1f 0a 28 64 |ile inst|ead...(d|
|000036f0| 65 66 61 6c 69 61 73 20 | 27 64 69 66 66 2d 66 69 |efalias |'diff-fi|
|00003700| 6e 64 2d 66 69 6c 65 2d | 6f 74 68 65 72 2d 66 72 |nd-file-|other-fr|
|00003710| 61 6d 65 20 23 5b 28 6f | 6c 64 2d 66 69 6c 65 2d |ame #[(o|ld-file-|
|00003720| 70 29 20 22 c0 09 21 1a | c3 09 ab 84 0c 40 aa 82 |p) "..!.|.....@..|
|00003730| 0d 40 21 88 c6 5c 6e 21 | 88 c7 c8 21 29 87 22 20 |.@!..\n!|...!)." |
|00003740| 5b 64 69 66 66 2d 66 69 | 6c 65 2d 6c 69 6e 65 20 |[diff-fi|le-line |
|00003750| 6f 6c 64 2d 66 69 6c 65 | 2d 70 20 6c 69 6e 65 20 |old-file|-p line |
|00003760| 66 69 6e 64 2d 66 69 6c | 65 2d 6f 74 68 65 72 2d |find-fil|e-other-|
|00003770| 66 72 61 6d 65 20 64 69 | 66 66 2d 6f 6c 64 2d 66 |frame di|ff-old-f|
|00003780| 69 6c 65 20 64 69 66 66 | 2d 6e 65 77 2d 66 69 6c |ile diff|-new-fil|
|00003790| 65 20 67 6f 74 6f 2d 6c | 69 6e 65 20 72 65 63 65 |e goto-l|ine rece|
|000037a0| 6e 74 65 72 20 30 5d 20 | 32 20 28 23 24 20 2e 20 |nter 0] |2 (#$ . |
|000037b0| 31 33 39 31 36 29 20 22 | 50 22 5d 29 0a 23 40 31 |13916) "|P"]).#@1|
|000037c0| 34 39 20 44 69 73 70 6c | 61 79 20 74 68 65 20 64 |49 Displ|ay the d|
|000037d0| 69 66 66 65 64 20 66 69 | 6c 65 20 69 6e 20 6f 74 |iffed fi|le in ot|
|000037e0| 68 65 72 20 77 69 6e 64 | 6f 77 2c 20 77 69 74 68 |her wind|ow, with|
|000037f0| 20 70 6f 69 6e 74 20 61 | 74 20 74 68 65 20 63 75 | point a|t the cu|
|00003800| 72 72 65 6e 74 20 68 75 | 6e 6b 2e 0a 44 65 66 61 |rrent hu|nk..Defa|
|00003810| 75 6c 74 20 69 73 20 74 | 6f 20 76 69 73 69 74 20 |ult is t|o visit |
|00003820| 74 68 65 20 6e 65 77 20 | 66 69 6c 65 3b 20 70 72 |the new |file; pr|
|00003830| 65 66 69 78 20 6d 65 61 | 6e 73 20 76 69 73 69 74 |efix mea|ns visit|
|00003840| 20 74 68 65 20 6f 6c 64 | 20 66 69 6c 65 20 69 6e | the old| file in|
|00003850| 73 74 65 61 64 2e 1f 0a | 28 64 65 66 61 6c 69 61 |stead...|(defalia|
|00003860| 73 20 27 64 69 66 66 2d | 64 69 73 70 6c 61 79 2d |s 'diff-|display-|
|00003870| 66 69 6c 65 20 23 5b 28 | 6f 6c 64 2d 66 69 6c 65 |file #[(|old-file|
|00003880| 2d 70 29 20 22 c0 09 21 | c2 c3 09 ab 84 0c 40 aa |-p) "..!|......@.|
|00003890| 82 0d 40 21 21 c6 20 1e | 07 1e 08 1e 09 ca 8e cb |..@!!. .|........|
|000038a0| 0e 08 21 88 cc 0e 09 21 | 88 cd ce 21 2c 87 22 20 |..!....!|...!,." |
|000038b0| 5b 64 69 66 66 2d 66 69 | 6c 65 2d 6c 69 6e 65 20 |[diff-fi|le-line |
|000038c0| 6f 6c 64 2d 66 69 6c 65 | 2d 70 20 64 69 73 70 6c |old-file|-p displ|
|000038d0| 61 79 2d 62 75 66 66 65 | 72 20 66 69 6e 64 2d 66 |ay-buffe|r find-f|
|000038e0| 69 6c 65 2d 6e 6f 73 65 | 6c 65 63 74 20 64 69 66 |ile-nose|lect dif|
|000038f0| 66 2d 6f 6c 64 2d 66 69 | 6c 65 20 64 69 66 66 2d |f-old-fi|le diff-|
|00003900| 6e 65 77 2d 66 69 6c 65 | 20 73 65 6c 65 63 74 65 |new-file| selecte|
|00003910| 64 2d 77 69 6e 64 6f 77 | 20 63 75 72 72 2d 77 69 |d-window| curr-wi|
|00003920| 6e 64 20 77 69 6e 64 20 | 6c 69 6e 65 20 28 28 73 |nd wind |line ((s|
|00003930| 65 6c 65 63 74 2d 77 69 | 6e 64 6f 77 20 63 75 72 |elect-wi|ndow cur|
|00003940| 72 2d 77 69 6e 64 29 29 | 20 73 65 6c 65 63 74 2d |r-wind))| select-|
|00003950| 77 69 6e 64 6f 77 20 67 | 6f 74 6f 2d 6c 69 6e 65 |window g|oto-line|
|00003960| 20 72 65 63 65 6e 74 65 | 72 20 30 5d 20 34 20 28 | recente|r 0] 4 (|
|00003970| 23 24 20 2e 20 31 34 32 | 37 35 29 20 22 50 22 5d |#$ . 142|75) "P"]|
|00003980| 29 0a 23 40 33 39 20 51 | 75 69 74 20 64 69 66 66 |).#@39 Q|uit diff|
|00003990| 20 62 79 20 6b 69 6c 6c | 69 6e 67 20 74 68 65 20 | by kill|ing the |
|000039a0| 64 69 66 66 20 62 75 66 | 66 65 72 2e 1f 0a 28 64 |diff buf|fer...(d|
|000039b0| 65 66 61 6c 69 61 73 20 | 27 64 69 66 66 2d 71 75 |efalias |'diff-qu|
|000039c0| 69 74 20 23 5b 6e 69 6c | 20 22 c0 c1 21 88 c2 20 |it #[nil| "..!.. |
|000039d0| 87 22 20 5b 6b 69 6c 6c | 2d 62 75 66 66 65 72 20 |." [kill|-buffer |
|000039e0| 22 2a 44 69 66 66 20 4f | 75 74 70 75 74 2a 22 20 |"*Diff O|utput*" |
|000039f0| 64 69 66 66 2d 63 6c 65 | 61 6e 75 70 2d 62 75 66 |diff-cle|anup-buf|
|00003a00| 66 65 72 73 5d 20 32 20 | 28 23 24 20 2e 20 31 34 |fers] 2 |(#$ . 14|
|00003a10| 37 32 37 29 20 6e 69 6c | 5d 29 0a 23 40 34 38 20 |727) nil|]).#@48 |
|00003a20| 4e 61 72 72 6f 77 20 64 | 69 66 66 20 62 75 66 66 |Narrow d|iff buff|
|00003a30| 65 72 20 74 6f 20 63 75 | 72 72 65 6e 74 20 64 69 |er to cu|rrent di|
|00003a40| 66 66 65 72 65 6e 63 65 | 20 68 75 6e 6b 2e 1f 0a |fference| hunk...|
|00003a50| 28 64 65 66 61 6c 69 61 | 73 20 27 64 69 66 66 2d |(defalia|s 'diff-|
|00003a60| 6e 61 72 72 6f 77 20 23 | 5b 6e 69 6c 20 22 c0 09 |narrow #|[nil "..|
|00003a70| 21 c2 09 21 7d 87 22 20 | 5b 64 69 66 66 2d 68 75 |!..!}." |[diff-hu|
|00003a80| 6e 6b 2d 6d 69 6e 20 64 | 69 66 66 2d 63 75 72 72 |nk-min d|iff-curr|
|00003a90| 65 6e 74 2d 68 75 6e 6b | 20 64 69 66 66 2d 68 75 |ent-hunk| diff-hu|
|00003aa0| 6e 6b 2d 6d 61 78 5d 20 | 33 20 28 23 24 20 2e 20 |nk-max] |3 (#$ . |
|00003ab0| 31 34 38 38 30 29 20 6e | 69 6c 5d 29 0a 28 72 75 |14880) n|il]).(ru|
|00003ac0| 6e 2d 68 6f 6f 6b 73 20 | 27 64 69 66 66 2d 6c 6f |n-hooks |'diff-lo|
|00003ad0| 61 64 2d 68 6f 6f 6b 29 | 0a                      |ad-hook)|.       |
+--------+-------------------------+-------------------------+--------+--------+